Changes for cm-10.1