Update for cm-10.2