Making sure that both receiving and sending endpoints are considered when
returning the distinct list of endpoints. #PF-115 Fixed