#1282 Preparing to support multiple versions of FriendEndpoint