Separate API router from server. Upstream-commit: 4f677df0d1fe1cdb24ecacd16f8692a6c46ffc21 Component: engine