Merge branch 'udp-ipv6-optimisations'