Merged server config changes