Refactor discriminator merging for Scrutinizer
Merge branch 'fix/discriminator-merging' into feat/discriminator-group