Merge branch "cm-11.0" into kylin

Merge branch "cm-11.0" into kylin