Sync cm-10.2 changes to cm-10.1