Merge from cm-10.1