merge cm-10.2 changes into cm-11 (2)