Fix for entity generator discriminator column
Merge branch 'DDC-2638' into 2.4