Merge "Update server settings to current look"