merge cm-10.1 changes into cm-10.2