merge from cm-10.1