Fix client.query using defaultOptions.watchQuery
#13135
+130
−10
Merged