Merge new stuff from cm_strings into slim_strings