Fix env conversion issues in env Upstream-commit: 0c8ddd502e90d5e35c04179f98f29fc4550af5c9 Component: engine