Merge "Improve ipv6 configuration"