Merge branch 'cmtomerge' into cm-10.2