Merge "GRPC client for broker"