environment variable updates
Merge branch 'dev'