HHH-5869 - Add suport for nationalized character mappings