Improve no command handling Upstream-commit: b42e669a190db43c9d9aa7a01153197bf9a1c9ab Component: engine