Merge remote-tracking branch 'CM/cm-11.0' into bacon