Merge "Retrieve IPv4 and IPv6 addresses for client and server device in test setup" into main