Prepare for cm-11.0