Re-apply synchronization fix to Orchestrator