iOS engine code merge (step 1)