Merge cm-10.2 branch changes