Merge "Rework IPv6 address comparison"