Merge "Fix IpClientTest"