Code review markups
Merge remote-tracking branch 'origin/ipv6_harder' into ipv6_harder