Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1