merge the newest cm-10.2 codes