Merge "Codec2Mapper: Properly lower case strings"