Fix issue where build steps are duplicated in the output Upstream-commit: b5d68944f49136fab1edb2c297ae246fd1e42fbc Component: engine