APOLLO-2304 Fixed discriminator map