changes for cm-10.2