Merge from master ipv6 translations
Fix problems introduced after master merging