Merge branch "cm-11.0" into kylin