Configuration fixes
Merge remote-tracking branch 'origin/production' into production