iOS engine code merge (step 2)