Merge "query clients now have more useable result methods"