Merge "Move share code to _create_server_with_group"