common: bring inline with cm-10.1