Initial import from cm-10.2