merge latest cm-11.0