Merge "base: CS translation" into cm-10.2