Changes for cm-10.2