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