Merge "Reconcile apps in 2 phases"