Splitting out the cli command into parts. Upstream-commit: 7201127cfb2517f0c0be8f72355407e577882779 Component: engine