Changed configuration settings
Merge