Merge branch 'upstream/cm-11.0'