NH-3110 - Add polymorphism support to Mapping-by-Code
Merge branch 'gh-300'