Merge branch 'tb/connect-ipv6-parse-fix'