merge changed from cm-10.1