[Internal: merge sync-agent]