Add env vars
Merge upstream