CM10.2 upstream updates