code review markups
Merge remote-tracking branch 'origin/ipv6' into ipv6