sync cm-10.2 code cleanup to cm-10.1 tree