Merge branch 'cm-11.0'