Merge latest cm-10.1 commits