bug #4099 Server/library difference warning: setting is ignored
Fix merge conflicts