Merge branch 'cm-11.0', fix merge conflicts