Trying to resolve the envVars...
Merge remote-tracking branch 'origin/master'