I think the GRPC call needs to add timeout
I think the GRPC call needs to add timeout