Merge "Add a mechanism to pass the L2Key and group hint to IpClient"