Updated references to environment variables.
Merge remote-tracking branch 'upstream/beta' into beta