merged ipv6 patch