Ipv6 master improvements