Update for cm-12.0