Merge "Avoid exceptions with IPv6 subnets"