Distinguish ENV from setting environment inline Upstream-commit: 7d4bbc2ed8305a730267e861bfe71ac7dbd3e373 Component: engine