Merge "Make update_server use **kwargs"