CMS i18n changes from Tsinghua