APOLLO-3179 Update to null entity on discriminator map