Update to cm-11.0 branch