Merge "Remove the blocking wait for IpClient" into sc-dev