NH-3667 & NH-3102
Merge pull request #311 from rjperes/NH-3667

NH-3667 & NH-3102 Dictionary mapping-by-code improvements