merge branch cm-11.0-new