CONN-53 subtask CONN-226: Saving Direct Endpoints.