Merge "Fixing the gRPC consumer side"