Merge branch 'cm-11.0' into latona-3.0.y