wip/sync-server-dependencies
