common: sync with cm-10.1