Explicitly expose env var
Merge branch 'staging'