merge cm-10.1 changes