- merge more cm-10.2 changes into cm-10.1 - code cleanup