Patch to cm-11.0