changes for cm-12.0