[v6r13] IPv6 fixes

The same fixes for IPv6 as #2160 (but against v6r13).