bring inline with cm-11.0