NH-3048
Added unit test
Merge branches 'gh-321' and 'gh-322'
NH-3110 - Add polymorphism support to Mapping-by-Code
Merge branch 'gh-300'
NH-2823
Merge branch 'gh-307'