As done in #12923 for the GatewayExtension type, the type discriminator is largely unnecessary as should be made optional and marked for deprecation