Merge "Adds scenario for IPv6 addresses"