merge upstream/ipv6 commit 3b7d3e1dc44d438b7d88c39f016d1f975beee08a