Merge "Fix for missing grpc module"