Explicitly expose env var for configuration
Merge branch 'staging'