Enhanced port integration-cli tests Upstream-commit: 874d64e690338a7aba3e8e4ecff793f1893bdb9d Component: engine