Merge "Resolve the endpoint in legacy VPN"