Updating prod settings
Merge branch 'staging'