CM10 and fixed bad merge