Merge branch 'cm-11.0' into stable/cm-11.0