Merge "add create_server_with_extras"