Merge "Check discriminator before accessing FrontendCapabilities information." into sc-dev