Fix panic in integration-cli Upstream-commit: 68c256cd40f69aac70ea3be330936daff2a909a9 Component: engine