Update settings.yaml and postgresql.yaml
Merge remote-tracking branch 'origin/i0100'