Merge remote-tracking branch 'github/cm-11.0' into HEAD