TBD-1018: add missing data type mappings.
Merge remote-tracking branch 'origin/maintenance/5.6'