merge more cm-10.2 changes