Merge "Skip adding ingress discard rule to legacy VPN" into main