Merge milestone cm-11.0-new