HCOLL-74 introduced other type mappings
Merge remote-tracking branch 'origin/master'