Update CM to the latest
Merge remote-tracking branch 'upstream/master' into i18n-extman
Changed string