Merge "Make grpc lib available for recovery" into main