Merging env vars to master

Merging env vars to master