Prepare for cm-10.1