patch for configuration override test
Merge remote-tracking branch 'origin/feature/multisite-with-demo-config' into feature/multisite-with-demo-config