Updates to ipv6 from caf