Don't allow empty env names Upstream-commit: c73b054ae384a519330de765026d7aed41a3e027 Component: engine