Move some integration to cli Upstream-commit: 91a2f22acac569b8e1bf279845c53e0499de50d4 Component: engine