Merge with IPv6 repo