Merge pull request #2725 from RafaelMarinheiro/fix_grpc_query_values