Pass on the given env
Merge pull request #3154 from torhve/develop

Pass on the given env