Merge remote-tracking branch 'cm/cm-12.0' into sm-5.0