Fix invalid argument error on push Upstream-commit: c8ccfcb93048e24dbe08b2c449dd1ad802f730f4 Component: engine