merge cm-10.2 branch