merge first commit into cm-10.2