Merge "possibly fix clat ingress nat64 drop" into main