Code review markups.
Merge branch 'ipv6', remote-tracking branch 'origin/ipv6' into ipv6
Fix compilation errors.