Sync with cm-10.1 changes