Fix issue with exit code in non-tty mode. Upstream-commit: 3cb5bc5ae524531e0285661aec5f1542d6d09d51 Component: engine