Merge for cm-11.0

Merge for cm-11.0