Endpoint now chooses endpoint for sending based on subnet as well