diff --git a/README.md b/README.md
index dd3b119fa..73bf20b7a 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,9 @@ The supported *request specific options* are:
   requestTimeout: number, // client default
   maxRetries: number, // default `5`
   asStream: boolean, // default `false`
-  headers: object // default `null`
+  compression: string, // default `false`
+  headers: object, // default `null`
+  querystring: object // default `null`
 }
 ```
 
diff --git a/api/api/bulk.js b/api/api/bulk.js
index 419b56196..f1ebde7d1 100644
--- a/api/api/bulk.js
+++ b/api/api/bulk.js
@@ -149,6 +149,7 @@ function buildBulk (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.aliases.js b/api/api/cat.aliases.js
index 9b28f6edd..8378c9602 100644
--- a/api/api/cat.aliases.js
+++ b/api/api/cat.aliases.js
@@ -131,6 +131,7 @@ function buildCatAliases (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.allocation.js b/api/api/cat.allocation.js
index 98f257d96..2e771d29c 100644
--- a/api/api/cat.allocation.js
+++ b/api/api/cat.allocation.js
@@ -133,6 +133,7 @@ function buildCatAllocation (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.count.js b/api/api/cat.count.js
index c57074c9f..443af2669 100644
--- a/api/api/cat.count.js
+++ b/api/api/cat.count.js
@@ -131,6 +131,7 @@ function buildCatCount (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.fielddata.js b/api/api/cat.fielddata.js
index 6fb432d58..47332ef7f 100644
--- a/api/api/cat.fielddata.js
+++ b/api/api/cat.fielddata.js
@@ -135,6 +135,7 @@ function buildCatFielddata (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.health.js b/api/api/cat.health.js
index 0db6c289b..e9b145928 100644
--- a/api/api/cat.health.js
+++ b/api/api/cat.health.js
@@ -128,6 +128,7 @@ function buildCatHealth (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.help.js b/api/api/cat.help.js
index f85171721..5e83855f1 100644
--- a/api/api/cat.help.js
+++ b/api/api/cat.help.js
@@ -115,6 +115,7 @@ function buildCatHelp (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.indices.js b/api/api/cat.indices.js
index 62f365588..c84a3e36f 100644
--- a/api/api/cat.indices.js
+++ b/api/api/cat.indices.js
@@ -137,6 +137,7 @@ function buildCatIndices (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.master.js b/api/api/cat.master.js
index 31adac93f..ec9ad0df9 100644
--- a/api/api/cat.master.js
+++ b/api/api/cat.master.js
@@ -126,6 +126,7 @@ function buildCatMaster (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.nodeattrs.js b/api/api/cat.nodeattrs.js
index 9e97e6a24..41d02a0be 100644
--- a/api/api/cat.nodeattrs.js
+++ b/api/api/cat.nodeattrs.js
@@ -126,6 +126,7 @@ function buildCatNodeattrs (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.nodes.js b/api/api/cat.nodes.js
index bcd3c0662..5b2ed0383 100644
--- a/api/api/cat.nodes.js
+++ b/api/api/cat.nodes.js
@@ -129,6 +129,7 @@ function buildCatNodes (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.pending_tasks.js b/api/api/cat.pending_tasks.js
index f24bff525..bb2c8113b 100644
--- a/api/api/cat.pending_tasks.js
+++ b/api/api/cat.pending_tasks.js
@@ -126,6 +126,7 @@ function buildCatPendingTasks (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.plugins.js b/api/api/cat.plugins.js
index c55fcdd29..50164c6a1 100644
--- a/api/api/cat.plugins.js
+++ b/api/api/cat.plugins.js
@@ -126,6 +126,7 @@ function buildCatPlugins (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.recovery.js b/api/api/cat.recovery.js
index 42e0c1e0c..13bb08eb3 100644
--- a/api/api/cat.recovery.js
+++ b/api/api/cat.recovery.js
@@ -131,6 +131,7 @@ function buildCatRecovery (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.repositories.js b/api/api/cat.repositories.js
index 8e8b6f6c9..dbbc6ee2d 100644
--- a/api/api/cat.repositories.js
+++ b/api/api/cat.repositories.js
@@ -126,6 +126,7 @@ function buildCatRepositories (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.segments.js b/api/api/cat.segments.js
index c10af3b23..9c1b6b5c0 100644
--- a/api/api/cat.segments.js
+++ b/api/api/cat.segments.js
@@ -128,6 +128,7 @@ function buildCatSegments (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.shards.js b/api/api/cat.shards.js
index 5ae0d1b18..49b6d41c0 100644
--- a/api/api/cat.shards.js
+++ b/api/api/cat.shards.js
@@ -133,6 +133,7 @@ function buildCatShards (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.snapshots.js b/api/api/cat.snapshots.js
index af82bc574..c2c865693 100644
--- a/api/api/cat.snapshots.js
+++ b/api/api/cat.snapshots.js
@@ -132,6 +132,7 @@ function buildCatSnapshots (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.tasks.js b/api/api/cat.tasks.js
index c8005d5e7..d51f221a2 100644
--- a/api/api/cat.tasks.js
+++ b/api/api/cat.tasks.js
@@ -131,6 +131,7 @@ function buildCatTasks (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.templates.js b/api/api/cat.templates.js
index ff89cb284..0641d29d8 100644
--- a/api/api/cat.templates.js
+++ b/api/api/cat.templates.js
@@ -131,6 +131,7 @@ function buildCatTemplates (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cat.thread_pool.js b/api/api/cat.thread_pool.js
index 0b07b0e0a..5875d9518 100644
--- a/api/api/cat.thread_pool.js
+++ b/api/api/cat.thread_pool.js
@@ -133,6 +133,7 @@ function buildCatThreadPool (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.delete_auto_follow_pattern.js b/api/api/ccr.delete_auto_follow_pattern.js
index d5ebd1cfd..b6712ad90 100644
--- a/api/api/ccr.delete_auto_follow_pattern.js
+++ b/api/api/ccr.delete_auto_follow_pattern.js
@@ -107,6 +107,7 @@ function buildCcrDeleteAutoFollowPattern (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.follow.js b/api/api/ccr.follow.js
index 7c86848bf..ba45eef1f 100644
--- a/api/api/ccr.follow.js
+++ b/api/api/ccr.follow.js
@@ -115,6 +115,7 @@ function buildCcrFollow (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.follow_info.js b/api/api/ccr.follow_info.js
index ec9923b1f..6a9655b0e 100644
--- a/api/api/ccr.follow_info.js
+++ b/api/api/ccr.follow_info.js
@@ -99,6 +99,7 @@ function buildCcrFollowInfo (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.follow_stats.js b/api/api/ccr.follow_stats.js
index 62ee7f266..c887b7f5f 100644
--- a/api/api/ccr.follow_stats.js
+++ b/api/api/ccr.follow_stats.js
@@ -99,6 +99,7 @@ function buildCcrFollowStats (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.get_auto_follow_pattern.js b/api/api/ccr.get_auto_follow_pattern.js
index 261bce9ac..e892c2b93 100644
--- a/api/api/ccr.get_auto_follow_pattern.js
+++ b/api/api/ccr.get_auto_follow_pattern.js
@@ -103,6 +103,7 @@ function buildCcrGetAutoFollowPattern (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.pause_follow.js b/api/api/ccr.pause_follow.js
index 81b0cde7b..5f9427b69 100644
--- a/api/api/ccr.pause_follow.js
+++ b/api/api/ccr.pause_follow.js
@@ -107,6 +107,7 @@ function buildCcrPauseFollow (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.put_auto_follow_pattern.js b/api/api/ccr.put_auto_follow_pattern.js
index 846a29445..b3245095e 100644
--- a/api/api/ccr.put_auto_follow_pattern.js
+++ b/api/api/ccr.put_auto_follow_pattern.js
@@ -114,6 +114,7 @@ function buildCcrPutAutoFollowPattern (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.resume_follow.js b/api/api/ccr.resume_follow.js
index ac47bfac5..542af5bb2 100644
--- a/api/api/ccr.resume_follow.js
+++ b/api/api/ccr.resume_follow.js
@@ -108,6 +108,7 @@ function buildCcrResumeFollow (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.stats.js b/api/api/ccr.stats.js
index 4de395d30..a574bb4b5 100644
--- a/api/api/ccr.stats.js
+++ b/api/api/ccr.stats.js
@@ -98,6 +98,7 @@ function buildCcrStats (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ccr.unfollow.js b/api/api/ccr.unfollow.js
index 5886296b2..ff68fc788 100644
--- a/api/api/ccr.unfollow.js
+++ b/api/api/ccr.unfollow.js
@@ -107,6 +107,7 @@ function buildCcrUnfollow (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/clear_scroll.js b/api/api/clear_scroll.js
index d3e0ec0ac..3a25bcdc0 100644
--- a/api/api/clear_scroll.js
+++ b/api/api/clear_scroll.js
@@ -109,6 +109,7 @@ function buildClearScroll (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.allocation_explain.js b/api/api/cluster.allocation_explain.js
index 2392e61c7..6355100c2 100644
--- a/api/api/cluster.allocation_explain.js
+++ b/api/api/cluster.allocation_explain.js
@@ -110,6 +110,7 @@ function buildClusterAllocationExplain (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.get_settings.js b/api/api/cluster.get_settings.js
index d024742cb..568d5c4f1 100644
--- a/api/api/cluster.get_settings.js
+++ b/api/api/cluster.get_settings.js
@@ -122,6 +122,7 @@ function buildClusterGetSettings (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.health.js b/api/api/cluster.health.js
index f8a75c1f4..6b0bfffae 100644
--- a/api/api/cluster.health.js
+++ b/api/api/cluster.health.js
@@ -143,6 +143,7 @@ function buildClusterHealth (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.pending_tasks.js b/api/api/cluster.pending_tasks.js
index 43ddbf53c..e3052a663 100644
--- a/api/api/cluster.pending_tasks.js
+++ b/api/api/cluster.pending_tasks.js
@@ -116,6 +116,7 @@ function buildClusterPendingTasks (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.put_settings.js b/api/api/cluster.put_settings.js
index 54ec859ed..f50230a39 100644
--- a/api/api/cluster.put_settings.js
+++ b/api/api/cluster.put_settings.js
@@ -120,6 +120,7 @@ function buildClusterPutSettings (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.remote_info.js b/api/api/cluster.remote_info.js
index 95f965c44..97939e755 100644
--- a/api/api/cluster.remote_info.js
+++ b/api/api/cluster.remote_info.js
@@ -111,6 +111,7 @@ function buildClusterRemoteInfo (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.reroute.js b/api/api/cluster.reroute.js
index d106cd13c..40e7b731e 100644
--- a/api/api/cluster.reroute.js
+++ b/api/api/cluster.reroute.js
@@ -119,6 +119,7 @@ function buildClusterReroute (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.state.js b/api/api/cluster.state.js
index a8b350120..6560a3b0d 100644
--- a/api/api/cluster.state.js
+++ b/api/api/cluster.state.js
@@ -150,6 +150,7 @@ function buildClusterState (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/cluster.stats.js b/api/api/cluster.stats.js
index b313c7827..b5e2035eb 100644
--- a/api/api/cluster.stats.js
+++ b/api/api/cluster.stats.js
@@ -121,6 +121,7 @@ function buildClusterStats (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/count.js b/api/api/count.js
index 536c07f62..28966aaeb 100644
--- a/api/api/count.js
+++ b/api/api/count.js
@@ -156,6 +156,7 @@ function buildCount (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/create.js b/api/api/create.js
index 4b7a113da..306a2720f 100644
--- a/api/api/create.js
+++ b/api/api/create.js
@@ -149,6 +149,7 @@ function buildCreate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/delete.js b/api/api/delete.js
index dd78e7c19..b2053515e 100644
--- a/api/api/delete.js
+++ b/api/api/delete.js
@@ -160,6 +160,7 @@ function buildDelete (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/delete_by_query.js b/api/api/delete_by_query.js
index cd0a34e9a..ae798c5fc 100644
--- a/api/api/delete_by_query.js
+++ b/api/api/delete_by_query.js
@@ -211,6 +211,7 @@ function buildDeleteByQuery (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/delete_by_query_rethrottle.js b/api/api/delete_by_query_rethrottle.js
index 089ccf67c..a0b2006bd 100644
--- a/api/api/delete_by_query_rethrottle.js
+++ b/api/api/delete_by_query_rethrottle.js
@@ -127,6 +127,7 @@ function buildDeleteByQueryRethrottle (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/delete_script.js b/api/api/delete_script.js
index 804c4bd3e..29647583b 100644
--- a/api/api/delete_script.js
+++ b/api/api/delete_script.js
@@ -123,6 +123,7 @@ function buildDeleteScript (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/exists.js b/api/api/exists.js
index b9b28eec3..13ff5edbf 100644
--- a/api/api/exists.js
+++ b/api/api/exists.js
@@ -156,6 +156,7 @@ function buildExists (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/exists_source.js b/api/api/exists_source.js
index bd5a93303..b3abeb2eb 100644
--- a/api/api/exists_source.js
+++ b/api/api/exists_source.js
@@ -166,6 +166,7 @@ function buildExistsSource (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/explain.js b/api/api/explain.js
index d37b203ab..206c765bc 100644
--- a/api/api/explain.js
+++ b/api/api/explain.js
@@ -156,6 +156,7 @@ function buildExplain (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/field_caps.js b/api/api/field_caps.js
index b8a091fb2..021412e99 100644
--- a/api/api/field_caps.js
+++ b/api/api/field_caps.js
@@ -127,6 +127,7 @@ function buildFieldCaps (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/get.js b/api/api/get.js
index d59494cc8..aea81e367 100644
--- a/api/api/get.js
+++ b/api/api/get.js
@@ -162,6 +162,7 @@ function buildGet (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/get_script.js b/api/api/get_script.js
index e0c42cfab..bb2eee166 100644
--- a/api/api/get_script.js
+++ b/api/api/get_script.js
@@ -121,6 +121,7 @@ function buildGetScript (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/get_source.js b/api/api/get_source.js
index 1ea12b53d..abbc53ac0 100644
--- a/api/api/get_source.js
+++ b/api/api/get_source.js
@@ -153,6 +153,7 @@ function buildGetSource (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.delete_lifecycle.js b/api/api/ilm.delete_lifecycle.js
index fcab49377..2e84b9e8b 100644
--- a/api/api/ilm.delete_lifecycle.js
+++ b/api/api/ilm.delete_lifecycle.js
@@ -107,6 +107,7 @@ function buildIlmDeleteLifecycle (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.explain_lifecycle.js b/api/api/ilm.explain_lifecycle.js
index 0e25f2fa0..7fbb00519 100644
--- a/api/api/ilm.explain_lifecycle.js
+++ b/api/api/ilm.explain_lifecycle.js
@@ -108,6 +108,7 @@ function buildIlmExplainLifecycle (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.get_lifecycle.js b/api/api/ilm.get_lifecycle.js
index 5b3a25a17..19e44d788 100644
--- a/api/api/ilm.get_lifecycle.js
+++ b/api/api/ilm.get_lifecycle.js
@@ -111,6 +111,7 @@ function buildIlmGetLifecycle (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.get_status.js b/api/api/ilm.get_status.js
index 801ff5275..1592c0804 100644
--- a/api/api/ilm.get_status.js
+++ b/api/api/ilm.get_status.js
@@ -106,6 +106,7 @@ function buildIlmGetStatus (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.move_to_step.js b/api/api/ilm.move_to_step.js
index 392421dbb..7807d5fd0 100644
--- a/api/api/ilm.move_to_step.js
+++ b/api/api/ilm.move_to_step.js
@@ -100,6 +100,7 @@ function buildIlmMoveToStep (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.put_lifecycle.js b/api/api/ilm.put_lifecycle.js
index dfbc27f82..39f91271a 100644
--- a/api/api/ilm.put_lifecycle.js
+++ b/api/api/ilm.put_lifecycle.js
@@ -100,6 +100,7 @@ function buildIlmPutLifecycle (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.remove_policy.js b/api/api/ilm.remove_policy.js
index c0d45128b..ee61c6322 100644
--- a/api/api/ilm.remove_policy.js
+++ b/api/api/ilm.remove_policy.js
@@ -107,6 +107,7 @@ function buildIlmRemovePolicy (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.retry.js b/api/api/ilm.retry.js
index 337f19ecf..ea52a066c 100644
--- a/api/api/ilm.retry.js
+++ b/api/api/ilm.retry.js
@@ -107,6 +107,7 @@ function buildIlmRetry (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.start.js b/api/api/ilm.start.js
index 1b692b3c0..f3b7b7eda 100644
--- a/api/api/ilm.start.js
+++ b/api/api/ilm.start.js
@@ -106,6 +106,7 @@ function buildIlmStart (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ilm.stop.js b/api/api/ilm.stop.js
index be9dfdaef..72c23b41b 100644
--- a/api/api/ilm.stop.js
+++ b/api/api/ilm.stop.js
@@ -106,6 +106,7 @@ function buildIlmStop (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/index.js b/api/api/index.js
index bb15a2ab3..9e39b0773 100644
--- a/api/api/index.js
+++ b/api/api/index.js
@@ -164,6 +164,7 @@ function buildIndex (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.analyze.js b/api/api/indices.analyze.js
index c4ae2ea1f..0bac6eda8 100644
--- a/api/api/indices.analyze.js
+++ b/api/api/indices.analyze.js
@@ -111,6 +111,7 @@ function buildIndicesAnalyze (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.clear_cache.js b/api/api/indices.clear_cache.js
index 55fcf8db1..e2fe21f1f 100644
--- a/api/api/indices.clear_cache.js
+++ b/api/api/indices.clear_cache.js
@@ -135,6 +135,7 @@ function buildIndicesClearCache (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.close.js b/api/api/indices.close.js
index c021ed985..df06e9c9b 100644
--- a/api/api/indices.close.js
+++ b/api/api/indices.close.js
@@ -132,6 +132,7 @@ function buildIndicesClose (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.create.js b/api/api/indices.create.js
index 669e763e0..9b786023a 100644
--- a/api/api/indices.create.js
+++ b/api/api/indices.create.js
@@ -124,6 +124,7 @@ function buildIndicesCreate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.delete.js b/api/api/indices.delete.js
index 8f7521a27..09983e420 100644
--- a/api/api/indices.delete.js
+++ b/api/api/indices.delete.js
@@ -132,6 +132,7 @@ function buildIndicesDelete (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.delete_alias.js b/api/api/indices.delete_alias.js
index 73cdac0f8..7a838ce27 100644
--- a/api/api/indices.delete_alias.js
+++ b/api/api/indices.delete_alias.js
@@ -142,6 +142,7 @@ function buildIndicesDeleteAlias (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.delete_template.js b/api/api/indices.delete_template.js
index 149b731bd..44287ae15 100644
--- a/api/api/indices.delete_template.js
+++ b/api/api/indices.delete_template.js
@@ -123,6 +123,7 @@ function buildIndicesDeleteTemplate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.exists.js b/api/api/indices.exists.js
index 106fe6ecd..a3e8f1d7c 100644
--- a/api/api/indices.exists.js
+++ b/api/api/indices.exists.js
@@ -135,6 +135,7 @@ function buildIndicesExists (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.exists_alias.js b/api/api/indices.exists_alias.js
index 9549b8d45..9b3e63071 100644
--- a/api/api/indices.exists_alias.js
+++ b/api/api/indices.exists_alias.js
@@ -134,6 +134,7 @@ function buildIndicesExistsAlias (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.exists_template.js b/api/api/indices.exists_template.js
index a8c7b5818..75757d155 100644
--- a/api/api/indices.exists_template.js
+++ b/api/api/indices.exists_template.js
@@ -126,6 +126,7 @@ function buildIndicesExistsTemplate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.exists_type.js b/api/api/indices.exists_type.js
index 7c405dd56..cab906314 100644
--- a/api/api/indices.exists_type.js
+++ b/api/api/indices.exists_type.js
@@ -144,6 +144,7 @@ function buildIndicesExistsType (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.flush.js b/api/api/indices.flush.js
index d949c3eb6..4be9c2ff8 100644
--- a/api/api/indices.flush.js
+++ b/api/api/indices.flush.js
@@ -130,6 +130,7 @@ function buildIndicesFlush (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.flush_synced.js b/api/api/indices.flush_synced.js
index a1dae252d..6437db5ae 100644
--- a/api/api/indices.flush_synced.js
+++ b/api/api/indices.flush_synced.js
@@ -125,6 +125,7 @@ function buildIndicesFlushSynced (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.forcemerge.js b/api/api/indices.forcemerge.js
index 455718fcb..2a50ad2fd 100644
--- a/api/api/indices.forcemerge.js
+++ b/api/api/indices.forcemerge.js
@@ -133,6 +133,7 @@ function buildIndicesForcemerge (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.freeze.js b/api/api/indices.freeze.js
index 4e2d6e6c2..f16cff125 100644
--- a/api/api/indices.freeze.js
+++ b/api/api/indices.freeze.js
@@ -128,6 +128,7 @@ function buildIndicesFreeze (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.get.js b/api/api/indices.get.js
index 87597eed6..86631e192 100644
--- a/api/api/indices.get.js
+++ b/api/api/indices.get.js
@@ -141,6 +141,7 @@ function buildIndicesGet (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.get_alias.js b/api/api/indices.get_alias.js
index 454d60580..25607b524 100644
--- a/api/api/indices.get_alias.js
+++ b/api/api/indices.get_alias.js
@@ -132,6 +132,7 @@ function buildIndicesGetAlias (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.get_field_mapping.js b/api/api/indices.get_field_mapping.js
index c3bf09e61..744e364f4 100644
--- a/api/api/indices.get_field_mapping.js
+++ b/api/api/indices.get_field_mapping.js
@@ -145,6 +145,7 @@ function buildIndicesGetFieldMapping (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.get_mapping.js b/api/api/indices.get_mapping.js
index 173d1d7c6..c669d8352 100644
--- a/api/api/indices.get_mapping.js
+++ b/api/api/indices.get_mapping.js
@@ -138,6 +138,7 @@ function buildIndicesGetMapping (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.get_settings.js b/api/api/indices.get_settings.js
index 08f5f7bc7..50e0b2b56 100644
--- a/api/api/indices.get_settings.js
+++ b/api/api/indices.get_settings.js
@@ -141,6 +141,7 @@ function buildIndicesGetSettings (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.get_template.js b/api/api/indices.get_template.js
index 2dfed0419..9d9d2b42d 100644
--- a/api/api/indices.get_template.js
+++ b/api/api/indices.get_template.js
@@ -127,6 +127,7 @@ function buildIndicesGetTemplate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.get_upgrade.js b/api/api/indices.get_upgrade.js
index 6ddbc646d..27f4faed4 100644
--- a/api/api/indices.get_upgrade.js
+++ b/api/api/indices.get_upgrade.js
@@ -125,6 +125,7 @@ function buildIndicesGetUpgrade (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.open.js b/api/api/indices.open.js
index 87e7b1417..3c2fe8b27 100644
--- a/api/api/indices.open.js
+++ b/api/api/indices.open.js
@@ -135,6 +135,7 @@ function buildIndicesOpen (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.put_alias.js b/api/api/indices.put_alias.js
index c6c5a2ee5..6571d9d85 100644
--- a/api/api/indices.put_alias.js
+++ b/api/api/indices.put_alias.js
@@ -137,6 +137,7 @@ function buildIndicesPutAlias (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.put_mapping.js b/api/api/indices.put_mapping.js
index c62fd80a6..96a3356f9 100644
--- a/api/api/indices.put_mapping.js
+++ b/api/api/indices.put_mapping.js
@@ -147,6 +147,7 @@ function buildIndicesPutMapping (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.put_settings.js b/api/api/indices.put_settings.js
index 8cf46293f..721c21600 100644
--- a/api/api/indices.put_settings.js
+++ b/api/api/indices.put_settings.js
@@ -137,6 +137,7 @@ function buildIndicesPutSettings (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.put_template.js b/api/api/indices.put_template.js
index 8f6f1c10e..f7c3eb8aa 100644
--- a/api/api/indices.put_template.js
+++ b/api/api/indices.put_template.js
@@ -134,6 +134,7 @@ function buildIndicesPutTemplate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.recovery.js b/api/api/indices.recovery.js
index 9556b44ee..dfcdcf11e 100644
--- a/api/api/indices.recovery.js
+++ b/api/api/indices.recovery.js
@@ -121,6 +121,7 @@ function buildIndicesRecovery (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.refresh.js b/api/api/indices.refresh.js
index 72298aca3..888ba0721 100644
--- a/api/api/indices.refresh.js
+++ b/api/api/indices.refresh.js
@@ -125,6 +125,7 @@ function buildIndicesRefresh (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.rollover.js b/api/api/indices.rollover.js
index c3bcd699a..ba04aafc6 100644
--- a/api/api/indices.rollover.js
+++ b/api/api/indices.rollover.js
@@ -140,6 +140,7 @@ function buildIndicesRollover (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.segments.js b/api/api/indices.segments.js
index f0058cc6d..07947e0d5 100644
--- a/api/api/indices.segments.js
+++ b/api/api/indices.segments.js
@@ -127,6 +127,7 @@ function buildIndicesSegments (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.shard_stores.js b/api/api/indices.shard_stores.js
index ff22da906..16ab0e17f 100644
--- a/api/api/indices.shard_stores.js
+++ b/api/api/indices.shard_stores.js
@@ -127,6 +127,7 @@ function buildIndicesShardStores (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.shrink.js b/api/api/indices.shrink.js
index 8f3eb332a..6f0dbf7ed 100644
--- a/api/api/indices.shrink.js
+++ b/api/api/indices.shrink.js
@@ -139,6 +139,7 @@ function buildIndicesShrink (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.split.js b/api/api/indices.split.js
index 51e22c94f..2048c5946 100644
--- a/api/api/indices.split.js
+++ b/api/api/indices.split.js
@@ -139,6 +139,7 @@ function buildIndicesSplit (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.stats.js b/api/api/indices.stats.js
index 879ff40ad..7730b4215 100644
--- a/api/api/indices.stats.js
+++ b/api/api/indices.stats.js
@@ -138,6 +138,7 @@ function buildIndicesStats (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.unfreeze.js b/api/api/indices.unfreeze.js
index 58ac257ac..6f8185ec0 100644
--- a/api/api/indices.unfreeze.js
+++ b/api/api/indices.unfreeze.js
@@ -128,6 +128,7 @@ function buildIndicesUnfreeze (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.update_aliases.js b/api/api/indices.update_aliases.js
index 7188e5112..43ead727b 100644
--- a/api/api/indices.update_aliases.js
+++ b/api/api/indices.update_aliases.js
@@ -117,6 +117,7 @@ function buildIndicesUpdateAliases (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.upgrade.js b/api/api/indices.upgrade.js
index a1614f0ff..3ac30c597 100644
--- a/api/api/indices.upgrade.js
+++ b/api/api/indices.upgrade.js
@@ -131,6 +131,7 @@ function buildIndicesUpgrade (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/indices.validate_query.js b/api/api/indices.validate_query.js
index 6088e7d7e..87a0c3331 100644
--- a/api/api/indices.validate_query.js
+++ b/api/api/indices.validate_query.js
@@ -150,6 +150,7 @@ function buildIndicesValidateQuery (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/info.js b/api/api/info.js
index 611a7382c..71393693a 100644
--- a/api/api/info.js
+++ b/api/api/info.js
@@ -111,6 +111,7 @@ function buildInfo (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ingest.delete_pipeline.js b/api/api/ingest.delete_pipeline.js
index 8a567cde5..4f5ead813 100644
--- a/api/api/ingest.delete_pipeline.js
+++ b/api/api/ingest.delete_pipeline.js
@@ -123,6 +123,7 @@ function buildIngestDeletePipeline (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ingest.get_pipeline.js b/api/api/ingest.get_pipeline.js
index 9c6a1f39f..8ecd6a1c7 100644
--- a/api/api/ingest.get_pipeline.js
+++ b/api/api/ingest.get_pipeline.js
@@ -119,6 +119,7 @@ function buildIngestGetPipeline (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ingest.processor_grok.js b/api/api/ingest.processor_grok.js
index 0d040e3e0..711193ce2 100644
--- a/api/api/ingest.processor_grok.js
+++ b/api/api/ingest.processor_grok.js
@@ -111,6 +111,7 @@ function buildIngestProcessorGrok (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ingest.put_pipeline.js b/api/api/ingest.put_pipeline.js
index 2030a6be0..c3d7f2a55 100644
--- a/api/api/ingest.put_pipeline.js
+++ b/api/api/ingest.put_pipeline.js
@@ -124,6 +124,7 @@ function buildIngestPutPipeline (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ingest.simulate.js b/api/api/ingest.simulate.js
index 00caaa44b..990e6b784 100644
--- a/api/api/ingest.simulate.js
+++ b/api/api/ingest.simulate.js
@@ -119,6 +119,7 @@ function buildIngestSimulate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/mget.js b/api/api/mget.js
index 5844be7e5..2551c284a 100644
--- a/api/api/mget.js
+++ b/api/api/mget.js
@@ -147,6 +147,7 @@ function buildMget (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.close_job.js b/api/api/ml.close_job.js
index 729923e0d..e23ae7d6c 100644
--- a/api/api/ml.close_job.js
+++ b/api/api/ml.close_job.js
@@ -114,6 +114,7 @@ function buildMlCloseJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_calendar.js b/api/api/ml.delete_calendar.js
index dd57aed36..61c86a2f1 100644
--- a/api/api/ml.delete_calendar.js
+++ b/api/api/ml.delete_calendar.js
@@ -113,6 +113,7 @@ function buildMlDeleteCalendar (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_calendar_event.js b/api/api/ml.delete_calendar_event.js
index fcda6a576..9a7c31919 100644
--- a/api/api/ml.delete_calendar_event.js
+++ b/api/api/ml.delete_calendar_event.js
@@ -128,6 +128,7 @@ function buildMlDeleteCalendarEvent (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_calendar_job.js b/api/api/ml.delete_calendar_job.js
index 5a7b39f8f..56d28eb2b 100644
--- a/api/api/ml.delete_calendar_job.js
+++ b/api/api/ml.delete_calendar_job.js
@@ -128,6 +128,7 @@ function buildMlDeleteCalendarJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_datafeed.js b/api/api/ml.delete_datafeed.js
index 057949b22..9b03cd943 100644
--- a/api/api/ml.delete_datafeed.js
+++ b/api/api/ml.delete_datafeed.js
@@ -114,6 +114,7 @@ function buildMlDeleteDatafeed (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_expired_data.js b/api/api/ml.delete_expired_data.js
index 62bafbc88..834fb37d6 100644
--- a/api/api/ml.delete_expired_data.js
+++ b/api/api/ml.delete_expired_data.js
@@ -106,6 +106,7 @@ function buildMlDeleteExpiredData (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_filter.js b/api/api/ml.delete_filter.js
index 33ceea713..79277818e 100644
--- a/api/api/ml.delete_filter.js
+++ b/api/api/ml.delete_filter.js
@@ -113,6 +113,7 @@ function buildMlDeleteFilter (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_forecast.js b/api/api/ml.delete_forecast.js
index bfa10cf2e..6d91e5d07 100644
--- a/api/api/ml.delete_forecast.js
+++ b/api/api/ml.delete_forecast.js
@@ -130,6 +130,7 @@ function buildMlDeleteForecast (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_job.js b/api/api/ml.delete_job.js
index af969304e..3f65d0e74 100644
--- a/api/api/ml.delete_job.js
+++ b/api/api/ml.delete_job.js
@@ -116,6 +116,7 @@ function buildMlDeleteJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.delete_model_snapshot.js b/api/api/ml.delete_model_snapshot.js
index 5108169e9..af996d5b4 100644
--- a/api/api/ml.delete_model_snapshot.js
+++ b/api/api/ml.delete_model_snapshot.js
@@ -128,6 +128,7 @@ function buildMlDeleteModelSnapshot (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.find_file_structure.js b/api/api/ml.find_file_structure.js
index 9d9aabbaf..b310b2bd1 100644
--- a/api/api/ml.find_file_structure.js
+++ b/api/api/ml.find_file_structure.js
@@ -139,6 +139,7 @@ function buildMlFindFileStructure (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.flush_job.js b/api/api/ml.flush_job.js
index 0f8c275d9..eb2b8c6cf 100644
--- a/api/api/ml.flush_job.js
+++ b/api/api/ml.flush_job.js
@@ -119,6 +119,7 @@ function buildMlFlushJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.forecast.js b/api/api/ml.forecast.js
index 45e94b8ac..a3b4187ca 100644
--- a/api/api/ml.forecast.js
+++ b/api/api/ml.forecast.js
@@ -116,6 +116,7 @@ function buildMlForecast (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_buckets.js b/api/api/ml.get_buckets.js
index a4b9cab22..6fce8b6ce 100644
--- a/api/api/ml.get_buckets.js
+++ b/api/api/ml.get_buckets.js
@@ -140,6 +140,7 @@ function buildMlGetBuckets (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_calendar_events.js b/api/api/ml.get_calendar_events.js
index 3c3a4924d..96342cd0c 100644
--- a/api/api/ml.get_calendar_events.js
+++ b/api/api/ml.get_calendar_events.js
@@ -123,6 +123,7 @@ function buildMlGetCalendarEvents (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_calendars.js b/api/api/ml.get_calendars.js
index e75331e41..9a83b4527 100644
--- a/api/api/ml.get_calendars.js
+++ b/api/api/ml.get_calendars.js
@@ -114,6 +114,7 @@ function buildMlGetCalendars (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_categories.js b/api/api/ml.get_categories.js
index 82b1c3d2f..2fa566eb7 100644
--- a/api/api/ml.get_categories.js
+++ b/api/api/ml.get_categories.js
@@ -116,6 +116,7 @@ function buildMlGetCategories (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_datafeed_stats.js b/api/api/ml.get_datafeed_stats.js
index 0775f5b57..7880aa86c 100644
--- a/api/api/ml.get_datafeed_stats.js
+++ b/api/api/ml.get_datafeed_stats.js
@@ -112,6 +112,7 @@ function buildMlGetDatafeedStats (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_datafeeds.js b/api/api/ml.get_datafeeds.js
index a6840e049..889b0d3f5 100644
--- a/api/api/ml.get_datafeeds.js
+++ b/api/api/ml.get_datafeeds.js
@@ -112,6 +112,7 @@ function buildMlGetDatafeeds (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_filters.js b/api/api/ml.get_filters.js
index aa5db006a..5c215fc50 100644
--- a/api/api/ml.get_filters.js
+++ b/api/api/ml.get_filters.js
@@ -114,6 +114,7 @@ function buildMlGetFilters (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_influencers.js b/api/api/ml.get_influencers.js
index 496a313f5..f3c447eda 100644
--- a/api/api/ml.get_influencers.js
+++ b/api/api/ml.get_influencers.js
@@ -125,6 +125,7 @@ function buildMlGetInfluencers (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_job_stats.js b/api/api/ml.get_job_stats.js
index 53ac81c06..6cd1cc9ad 100644
--- a/api/api/ml.get_job_stats.js
+++ b/api/api/ml.get_job_stats.js
@@ -112,6 +112,7 @@ function buildMlGetJobStats (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_jobs.js b/api/api/ml.get_jobs.js
index dd8a91275..d62975796 100644
--- a/api/api/ml.get_jobs.js
+++ b/api/api/ml.get_jobs.js
@@ -112,6 +112,7 @@ function buildMlGetJobs (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_model_snapshots.js b/api/api/ml.get_model_snapshots.js
index 6eeb06ab2..44a11e3c0 100644
--- a/api/api/ml.get_model_snapshots.js
+++ b/api/api/ml.get_model_snapshots.js
@@ -132,6 +132,7 @@ function buildMlGetModelSnapshots (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_overall_buckets.js b/api/api/ml.get_overall_buckets.js
index 5c34b0921..e5a0abe59 100644
--- a/api/api/ml.get_overall_buckets.js
+++ b/api/api/ml.get_overall_buckets.js
@@ -125,6 +125,7 @@ function buildMlGetOverallBuckets (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.get_records.js b/api/api/ml.get_records.js
index c8fecd3c7..b26b6c382 100644
--- a/api/api/ml.get_records.js
+++ b/api/api/ml.get_records.js
@@ -125,6 +125,7 @@ function buildMlGetRecords (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.info.js b/api/api/ml.info.js
index 401611802..8fbd22b38 100644
--- a/api/api/ml.info.js
+++ b/api/api/ml.info.js
@@ -98,6 +98,7 @@ function buildMlInfo (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.open_job.js b/api/api/ml.open_job.js
index 5f77f2dbe..ce4ed8a60 100644
--- a/api/api/ml.open_job.js
+++ b/api/api/ml.open_job.js
@@ -115,6 +115,7 @@ function buildMlOpenJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.post_calendar_events.js b/api/api/ml.post_calendar_events.js
index 6d956007d..30c9d0483 100644
--- a/api/api/ml.post_calendar_events.js
+++ b/api/api/ml.post_calendar_events.js
@@ -114,6 +114,7 @@ function buildMlPostCalendarEvents (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.post_data.js b/api/api/ml.post_data.js
index a6964a52d..63e754991 100644
--- a/api/api/ml.post_data.js
+++ b/api/api/ml.post_data.js
@@ -118,6 +118,7 @@ function buildMlPostData (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.preview_datafeed.js b/api/api/ml.preview_datafeed.js
index 562e09331..33eade853 100644
--- a/api/api/ml.preview_datafeed.js
+++ b/api/api/ml.preview_datafeed.js
@@ -113,6 +113,7 @@ function buildMlPreviewDatafeed (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.put_calendar.js b/api/api/ml.put_calendar.js
index 82fd3db68..8d83eeb8e 100644
--- a/api/api/ml.put_calendar.js
+++ b/api/api/ml.put_calendar.js
@@ -108,6 +108,7 @@ function buildMlPutCalendar (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.put_calendar_job.js b/api/api/ml.put_calendar_job.js
index f4882f2ed..a10aa05ea 100644
--- a/api/api/ml.put_calendar_job.js
+++ b/api/api/ml.put_calendar_job.js
@@ -128,6 +128,7 @@ function buildMlPutCalendarJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.put_datafeed.js b/api/api/ml.put_datafeed.js
index 8b0626212..8ebdcaaed 100644
--- a/api/api/ml.put_datafeed.js
+++ b/api/api/ml.put_datafeed.js
@@ -114,6 +114,7 @@ function buildMlPutDatafeed (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.put_filter.js b/api/api/ml.put_filter.js
index 3d637bf22..7b36d7c03 100644
--- a/api/api/ml.put_filter.js
+++ b/api/api/ml.put_filter.js
@@ -114,6 +114,7 @@ function buildMlPutFilter (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.put_job.js b/api/api/ml.put_job.js
index 08d444d1e..ee59f4507 100644
--- a/api/api/ml.put_job.js
+++ b/api/api/ml.put_job.js
@@ -114,6 +114,7 @@ function buildMlPutJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.revert_model_snapshot.js b/api/api/ml.revert_model_snapshot.js
index e3daf24aa..021c14589 100644
--- a/api/api/ml.revert_model_snapshot.js
+++ b/api/api/ml.revert_model_snapshot.js
@@ -124,6 +124,7 @@ function buildMlRevertModelSnapshot (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.set_upgrade_mode.js b/api/api/ml.set_upgrade_mode.js
index eaf40d34f..d83f85798 100644
--- a/api/api/ml.set_upgrade_mode.js
+++ b/api/api/ml.set_upgrade_mode.js
@@ -109,6 +109,7 @@ function buildMlSetUpgradeMode (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.start_datafeed.js b/api/api/ml.start_datafeed.js
index 62c0e24c7..f3d3abda0 100644
--- a/api/api/ml.start_datafeed.js
+++ b/api/api/ml.start_datafeed.js
@@ -113,6 +113,7 @@ function buildMlStartDatafeed (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.stop_datafeed.js b/api/api/ml.stop_datafeed.js
index 693a941b0..e148f50b4 100644
--- a/api/api/ml.stop_datafeed.js
+++ b/api/api/ml.stop_datafeed.js
@@ -113,6 +113,7 @@ function buildMlStopDatafeed (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.update_datafeed.js b/api/api/ml.update_datafeed.js
index 3ab93f76b..2335a79d6 100644
--- a/api/api/ml.update_datafeed.js
+++ b/api/api/ml.update_datafeed.js
@@ -114,6 +114,7 @@ function buildMlUpdateDatafeed (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.update_filter.js b/api/api/ml.update_filter.js
index 470ab31b8..058e037af 100644
--- a/api/api/ml.update_filter.js
+++ b/api/api/ml.update_filter.js
@@ -114,6 +114,7 @@ function buildMlUpdateFilter (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.update_job.js b/api/api/ml.update_job.js
index 56c58a686..d816daa25 100644
--- a/api/api/ml.update_job.js
+++ b/api/api/ml.update_job.js
@@ -114,6 +114,7 @@ function buildMlUpdateJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.update_model_snapshot.js b/api/api/ml.update_model_snapshot.js
index fc83d0ecb..916fcbd38 100644
--- a/api/api/ml.update_model_snapshot.js
+++ b/api/api/ml.update_model_snapshot.js
@@ -129,6 +129,7 @@ function buildMlUpdateModelSnapshot (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.validate.js b/api/api/ml.validate.js
index d7fb5728a..27d73b843 100644
--- a/api/api/ml.validate.js
+++ b/api/api/ml.validate.js
@@ -107,6 +107,7 @@ function buildMlValidate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ml.validate_detector.js b/api/api/ml.validate_detector.js
index 9c1afae6f..fb33bf0f4 100644
--- a/api/api/ml.validate_detector.js
+++ b/api/api/ml.validate_detector.js
@@ -107,6 +107,7 @@ function buildMlValidateDetector (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/monitoring.bulk.js b/api/api/monitoring.bulk.js
index 6b2c1e739..a64e64df1 100644
--- a/api/api/monitoring.bulk.js
+++ b/api/api/monitoring.bulk.js
@@ -119,6 +119,7 @@ function buildMonitoringBulk (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/msearch.js b/api/api/msearch.js
index f411473f2..9bcfa7f59 100644
--- a/api/api/msearch.js
+++ b/api/api/msearch.js
@@ -149,6 +149,7 @@ function buildMsearch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/msearch_template.js b/api/api/msearch_template.js
index 13a23fa80..6a9742b81 100644
--- a/api/api/msearch_template.js
+++ b/api/api/msearch_template.js
@@ -143,6 +143,7 @@ function buildMsearchTemplate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/mtermvectors.js b/api/api/mtermvectors.js
index c06dafd2c..fe3536d58 100644
--- a/api/api/mtermvectors.js
+++ b/api/api/mtermvectors.js
@@ -149,6 +149,7 @@ function buildMtermvectors (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/nodes.hot_threads.js b/api/api/nodes.hot_threads.js
index a4f70ff12..89525e654 100644
--- a/api/api/nodes.hot_threads.js
+++ b/api/api/nodes.hot_threads.js
@@ -135,6 +135,7 @@ function buildNodesHotThreads (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/nodes.info.js b/api/api/nodes.info.js
index c5a8648aa..c7fa93da0 100644
--- a/api/api/nodes.info.js
+++ b/api/api/nodes.info.js
@@ -126,6 +126,7 @@ function buildNodesInfo (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/nodes.reload_secure_settings.js b/api/api/nodes.reload_secure_settings.js
index 59fa010c3..3d9e0d167 100644
--- a/api/api/nodes.reload_secure_settings.js
+++ b/api/api/nodes.reload_secure_settings.js
@@ -118,6 +118,7 @@ function buildNodesReloadSecureSettings (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/nodes.stats.js b/api/api/nodes.stats.js
index 25f02f5a4..0606d2b2f 100644
--- a/api/api/nodes.stats.js
+++ b/api/api/nodes.stats.js
@@ -145,6 +145,7 @@ function buildNodesStats (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/nodes.usage.js b/api/api/nodes.usage.js
index 9400db998..743486535 100644
--- a/api/api/nodes.usage.js
+++ b/api/api/nodes.usage.js
@@ -123,6 +123,7 @@ function buildNodesUsage (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ping.js b/api/api/ping.js
index fe6acf9af..72ea90bf2 100644
--- a/api/api/ping.js
+++ b/api/api/ping.js
@@ -111,6 +111,7 @@ function buildPing (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/put_script.js b/api/api/put_script.js
index ae5cdce30..8b0d5b07c 100644
--- a/api/api/put_script.js
+++ b/api/api/put_script.js
@@ -139,6 +139,7 @@ function buildPutScript (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/rank_eval.js b/api/api/rank_eval.js
index 2d97a62d2..b109a1aac 100644
--- a/api/api/rank_eval.js
+++ b/api/api/rank_eval.js
@@ -126,6 +126,7 @@ function buildRankEval (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/reindex.js b/api/api/reindex.js
index ced743919..765f76057 100644
--- a/api/api/reindex.js
+++ b/api/api/reindex.js
@@ -127,6 +127,7 @@ function buildReindex (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/reindex_rethrottle.js b/api/api/reindex_rethrottle.js
index eebcc7f1e..b28d2d755 100644
--- a/api/api/reindex_rethrottle.js
+++ b/api/api/reindex_rethrottle.js
@@ -127,6 +127,7 @@ function buildReindexRethrottle (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/render_search_template.js b/api/api/render_search_template.js
index f9b53e3ba..70a36e2e0 100644
--- a/api/api/render_search_template.js
+++ b/api/api/render_search_template.js
@@ -109,6 +109,7 @@ function buildRenderSearchTemplate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/scripts_painless_execute.js b/api/api/scripts_painless_execute.js
index 0bf6379a6..a2af1402f 100644
--- a/api/api/scripts_painless_execute.js
+++ b/api/api/scripts_painless_execute.js
@@ -104,6 +104,7 @@ function buildScriptsPainlessExecute (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/scroll.js b/api/api/scroll.js
index 91cfbb82d..b5b93aa81 100644
--- a/api/api/scroll.js
+++ b/api/api/scroll.js
@@ -117,6 +117,7 @@ function buildScroll (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/search.js b/api/api/search.js
index 6d43f26aa..7606320e2 100644
--- a/api/api/search.js
+++ b/api/api/search.js
@@ -231,6 +231,7 @@ function buildSearch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/search_shards.js b/api/api/search_shards.js
index a142145a9..9451b2cd7 100644
--- a/api/api/search_shards.js
+++ b/api/api/search_shards.js
@@ -131,6 +131,7 @@ function buildSearchShards (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/search_template.js b/api/api/search_template.js
index 36b832f47..37b72ea8f 100644
--- a/api/api/search_template.js
+++ b/api/api/search_template.js
@@ -162,6 +162,7 @@ function buildSearchTemplate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.authenticate.js b/api/api/security.authenticate.js
index 3603102e0..ecbf4448b 100644
--- a/api/api/security.authenticate.js
+++ b/api/api/security.authenticate.js
@@ -106,6 +106,7 @@ function buildSecurityAuthenticate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.change_password.js b/api/api/security.change_password.js
index f289f027f..d1c59dbed 100644
--- a/api/api/security.change_password.js
+++ b/api/api/security.change_password.js
@@ -113,6 +113,7 @@ function buildSecurityChangePassword (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.clear_cached_realms.js b/api/api/security.clear_cached_realms.js
index 736b06ea6..2af732622 100644
--- a/api/api/security.clear_cached_realms.js
+++ b/api/api/security.clear_cached_realms.js
@@ -114,6 +114,7 @@ function buildSecurityClearCachedRealms (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.clear_cached_roles.js b/api/api/security.clear_cached_roles.js
index 4acd50cb0..67d30b743 100644
--- a/api/api/security.clear_cached_roles.js
+++ b/api/api/security.clear_cached_roles.js
@@ -113,6 +113,7 @@ function buildSecurityClearCachedRoles (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.create_api_key.js b/api/api/security.create_api_key.js
index c1b19ef5b..f96a3a5d5 100644
--- a/api/api/security.create_api_key.js
+++ b/api/api/security.create_api_key.js
@@ -108,6 +108,7 @@ function buildSecurityCreateApiKey (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.delete_privileges.js b/api/api/security.delete_privileges.js
index 934365e50..92f9e36b9 100644
--- a/api/api/security.delete_privileges.js
+++ b/api/api/security.delete_privileges.js
@@ -129,6 +129,7 @@ function buildSecurityDeletePrivileges (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.delete_role.js b/api/api/security.delete_role.js
index 50fc608ac..5901a856f 100644
--- a/api/api/security.delete_role.js
+++ b/api/api/security.delete_role.js
@@ -114,6 +114,7 @@ function buildSecurityDeleteRole (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.delete_role_mapping.js b/api/api/security.delete_role_mapping.js
index af0f32c32..6b546b179 100644
--- a/api/api/security.delete_role_mapping.js
+++ b/api/api/security.delete_role_mapping.js
@@ -114,6 +114,7 @@ function buildSecurityDeleteRoleMapping (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.delete_user.js b/api/api/security.delete_user.js
index 5f6c778ff..198f461fe 100644
--- a/api/api/security.delete_user.js
+++ b/api/api/security.delete_user.js
@@ -114,6 +114,7 @@ function buildSecurityDeleteUser (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.disable_user.js b/api/api/security.disable_user.js
index a07f6f433..d8b6452dc 100644
--- a/api/api/security.disable_user.js
+++ b/api/api/security.disable_user.js
@@ -108,6 +108,7 @@ function buildSecurityDisableUser (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.enable_user.js b/api/api/security.enable_user.js
index aefe27d78..ad2c9dbc3 100644
--- a/api/api/security.enable_user.js
+++ b/api/api/security.enable_user.js
@@ -108,6 +108,7 @@ function buildSecurityEnableUser (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.get_api_key.js b/api/api/security.get_api_key.js
index 231ccd8bc..bbbb4ad74 100644
--- a/api/api/security.get_api_key.js
+++ b/api/api/security.get_api_key.js
@@ -113,6 +113,7 @@ function buildSecurityGetApiKey (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.get_privileges.js b/api/api/security.get_privileges.js
index 3e5f5d5c3..952bacd6b 100644
--- a/api/api/security.get_privileges.js
+++ b/api/api/security.get_privileges.js
@@ -122,6 +122,7 @@ function buildSecurityGetPrivileges (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.get_role.js b/api/api/security.get_role.js
index b3d05555d..ea5b12583 100644
--- a/api/api/security.get_role.js
+++ b/api/api/security.get_role.js
@@ -111,6 +111,7 @@ function buildSecurityGetRole (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.get_role_mapping.js b/api/api/security.get_role_mapping.js
index d760fb184..62915f1c6 100644
--- a/api/api/security.get_role_mapping.js
+++ b/api/api/security.get_role_mapping.js
@@ -111,6 +111,7 @@ function buildSecurityGetRoleMapping (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.get_token.js b/api/api/security.get_token.js
index 407ff5b35..aa19be41d 100644
--- a/api/api/security.get_token.js
+++ b/api/api/security.get_token.js
@@ -107,6 +107,7 @@ function buildSecurityGetToken (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.get_user.js b/api/api/security.get_user.js
index 1de5e97bf..4419b0e08 100644
--- a/api/api/security.get_user.js
+++ b/api/api/security.get_user.js
@@ -111,6 +111,7 @@ function buildSecurityGetUser (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.get_user_privileges.js b/api/api/security.get_user_privileges.js
index 46f1706da..6d812c8db 100644
--- a/api/api/security.get_user_privileges.js
+++ b/api/api/security.get_user_privileges.js
@@ -106,6 +106,7 @@ function buildSecurityGetUserPrivileges (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.has_privileges.js b/api/api/security.has_privileges.js
index d0419c2c2..6f74c21a7 100644
--- a/api/api/security.has_privileges.js
+++ b/api/api/security.has_privileges.js
@@ -112,6 +112,7 @@ function buildSecurityHasPrivileges (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.invalidate_api_key.js b/api/api/security.invalidate_api_key.js
index d02d2148b..0da252564 100644
--- a/api/api/security.invalidate_api_key.js
+++ b/api/api/security.invalidate_api_key.js
@@ -107,6 +107,7 @@ function buildSecurityInvalidateApiKey (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.invalidate_token.js b/api/api/security.invalidate_token.js
index e58a221e4..09e66f50b 100644
--- a/api/api/security.invalidate_token.js
+++ b/api/api/security.invalidate_token.js
@@ -107,6 +107,7 @@ function buildSecurityInvalidateToken (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.put_privileges.js b/api/api/security.put_privileges.js
index d102615b1..dfb90769e 100644
--- a/api/api/security.put_privileges.js
+++ b/api/api/security.put_privileges.js
@@ -108,6 +108,7 @@ function buildSecurityPutPrivileges (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.put_role.js b/api/api/security.put_role.js
index d4e2de603..e417e69b2 100644
--- a/api/api/security.put_role.js
+++ b/api/api/security.put_role.js
@@ -115,6 +115,7 @@ function buildSecurityPutRole (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.put_role_mapping.js b/api/api/security.put_role_mapping.js
index 721d41ca6..45a25fc38 100644
--- a/api/api/security.put_role_mapping.js
+++ b/api/api/security.put_role_mapping.js
@@ -115,6 +115,7 @@ function buildSecurityPutRoleMapping (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/security.put_user.js b/api/api/security.put_user.js
index 4a9dc7467..9e8f46fb7 100644
--- a/api/api/security.put_user.js
+++ b/api/api/security.put_user.js
@@ -115,6 +115,7 @@ function buildSecurityPutUser (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.create.js b/api/api/snapshot.create.js
index fb74315c5..b3f3f426e 100644
--- a/api/api/snapshot.create.js
+++ b/api/api/snapshot.create.js
@@ -134,6 +134,7 @@ function buildSnapshotCreate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.create_repository.js b/api/api/snapshot.create_repository.js
index 010a3b2b1..b4db9c44c 100644
--- a/api/api/snapshot.create_repository.js
+++ b/api/api/snapshot.create_repository.js
@@ -126,6 +126,7 @@ function buildSnapshotCreateRepository (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.delete.js b/api/api/snapshot.delete.js
index ab0e48383..917c26630 100644
--- a/api/api/snapshot.delete.js
+++ b/api/api/snapshot.delete.js
@@ -136,6 +136,7 @@ function buildSnapshotDelete (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.delete_repository.js b/api/api/snapshot.delete_repository.js
index 18c4ae4bb..6e6aad2d9 100644
--- a/api/api/snapshot.delete_repository.js
+++ b/api/api/snapshot.delete_repository.js
@@ -123,6 +123,7 @@ function buildSnapshotDeleteRepository (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.get.js b/api/api/snapshot.get.js
index fd03f0260..0d1a437c6 100644
--- a/api/api/snapshot.get.js
+++ b/api/api/snapshot.get.js
@@ -141,6 +141,7 @@ function buildSnapshotGet (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.get_repository.js b/api/api/snapshot.get_repository.js
index a71c5f723..2998d02da 100644
--- a/api/api/snapshot.get_repository.js
+++ b/api/api/snapshot.get_repository.js
@@ -121,6 +121,7 @@ function buildSnapshotGetRepository (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.restore.js b/api/api/snapshot.restore.js
index 5feeaf569..36fe20924 100644
--- a/api/api/snapshot.restore.js
+++ b/api/api/snapshot.restore.js
@@ -134,6 +134,7 @@ function buildSnapshotRestore (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.status.js b/api/api/snapshot.status.js
index 6c376244f..08e35c90f 100644
--- a/api/api/snapshot.status.js
+++ b/api/api/snapshot.status.js
@@ -133,6 +133,7 @@ function buildSnapshotStatus (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/snapshot.verify_repository.js b/api/api/snapshot.verify_repository.js
index 27e1df088..8708e5135 100644
--- a/api/api/snapshot.verify_repository.js
+++ b/api/api/snapshot.verify_repository.js
@@ -123,6 +123,7 @@ function buildSnapshotVerifyRepository (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/ssl.certificates.js b/api/api/ssl.certificates.js
index 287edc0df..6a5d68894 100644
--- a/api/api/ssl.certificates.js
+++ b/api/api/ssl.certificates.js
@@ -106,6 +106,7 @@ function buildSslCertificates (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/tasks.cancel.js b/api/api/tasks.cancel.js
index 98e123fcd..33e64738c 100644
--- a/api/api/tasks.cancel.js
+++ b/api/api/tasks.cancel.js
@@ -123,6 +123,7 @@ function buildTasksCancel (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/tasks.get.js b/api/api/tasks.get.js
index 0b690a8a9..d968a6d38 100644
--- a/api/api/tasks.get.js
+++ b/api/api/tasks.get.js
@@ -123,6 +123,7 @@ function buildTasksGet (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/tasks.list.js b/api/api/tasks.list.js
index f54d77417..9b3ec93b6 100644
--- a/api/api/tasks.list.js
+++ b/api/api/tasks.list.js
@@ -128,6 +128,7 @@ function buildTasksList (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/termvectors.js b/api/api/termvectors.js
index 3e7552f72..84d557a5b 100644
--- a/api/api/termvectors.js
+++ b/api/api/termvectors.js
@@ -150,6 +150,7 @@ function buildTermvectors (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/update.js b/api/api/update.js
index 6fa970065..617b42aad 100644
--- a/api/api/update.js
+++ b/api/api/update.js
@@ -161,6 +161,7 @@ function buildUpdate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/update_by_query.js b/api/api/update_by_query.js
index 1e506f600..4e5287958 100644
--- a/api/api/update_by_query.js
+++ b/api/api/update_by_query.js
@@ -210,6 +210,7 @@ function buildUpdateByQuery (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/update_by_query_rethrottle.js b/api/api/update_by_query_rethrottle.js
index 654ad8cfd..c0ebd050b 100644
--- a/api/api/update_by_query_rethrottle.js
+++ b/api/api/update_by_query_rethrottle.js
@@ -127,6 +127,7 @@ function buildUpdateByQueryRethrottle (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.graph.explore.js b/api/api/xpack.graph.explore.js
index 5161ab7f0..1db3bf521 100644
--- a/api/api/xpack.graph.explore.js
+++ b/api/api/xpack.graph.explore.js
@@ -116,6 +116,7 @@ function buildXpackGraphExplore (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.info.js b/api/api/xpack.info.js
index a5bdbf823..36a9c745c 100644
--- a/api/api/xpack.info.js
+++ b/api/api/xpack.info.js
@@ -107,6 +107,7 @@ function buildXpackInfo (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.license.delete.js b/api/api/xpack.license.delete.js
index 48e1b8898..203e5d571 100644
--- a/api/api/xpack.license.delete.js
+++ b/api/api/xpack.license.delete.js
@@ -106,6 +106,7 @@ function buildXpackLicenseDelete (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.license.get.js b/api/api/xpack.license.get.js
index 5ed14eb42..af0ee628b 100644
--- a/api/api/xpack.license.get.js
+++ b/api/api/xpack.license.get.js
@@ -107,6 +107,7 @@ function buildXpackLicenseGet (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.license.get_basic_status.js b/api/api/xpack.license.get_basic_status.js
index f933920ae..35155a724 100644
--- a/api/api/xpack.license.get_basic_status.js
+++ b/api/api/xpack.license.get_basic_status.js
@@ -106,6 +106,7 @@ function buildXpackLicenseGetBasicStatus (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.license.get_trial_status.js b/api/api/xpack.license.get_trial_status.js
index 49bb6ec4d..5b84dfc27 100644
--- a/api/api/xpack.license.get_trial_status.js
+++ b/api/api/xpack.license.get_trial_status.js
@@ -106,6 +106,7 @@ function buildXpackLicenseGetTrialStatus (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.license.post.js b/api/api/xpack.license.post.js
index 6c9182099..ca7dc861f 100644
--- a/api/api/xpack.license.post.js
+++ b/api/api/xpack.license.post.js
@@ -100,6 +100,7 @@ function buildXpackLicensePost (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.license.post_start_basic.js b/api/api/xpack.license.post_start_basic.js
index 7484f4876..63b2cefa1 100644
--- a/api/api/xpack.license.post_start_basic.js
+++ b/api/api/xpack.license.post_start_basic.js
@@ -107,6 +107,7 @@ function buildXpackLicensePostStartBasic (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.license.post_start_trial.js b/api/api/xpack.license.post_start_trial.js
index ed9d04bf0..b16ddd42b 100644
--- a/api/api/xpack.license.post_start_trial.js
+++ b/api/api/xpack.license.post_start_trial.js
@@ -109,6 +109,7 @@ function buildXpackLicensePostStartTrial (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.migration.deprecations.js b/api/api/xpack.migration.deprecations.js
index 485e4cadb..3dbafd5b0 100644
--- a/api/api/xpack.migration.deprecations.js
+++ b/api/api/xpack.migration.deprecations.js
@@ -111,6 +111,7 @@ function buildXpackMigrationDeprecations (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.migration.get_assistance.js b/api/api/xpack.migration.get_assistance.js
index 96c0591cf..088810be2 100644
--- a/api/api/xpack.migration.get_assistance.js
+++ b/api/api/xpack.migration.get_assistance.js
@@ -110,6 +110,7 @@ function buildXpackMigrationGetAssistance (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.migration.upgrade.js b/api/api/xpack.migration.upgrade.js
index 16062ae81..67bd9497b 100644
--- a/api/api/xpack.migration.upgrade.js
+++ b/api/api/xpack.migration.upgrade.js
@@ -108,6 +108,7 @@ function buildXpackMigrationUpgrade (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.rollup.delete_job.js b/api/api/xpack.rollup.delete_job.js
index d463030c5..e2efbaaee 100644
--- a/api/api/xpack.rollup.delete_job.js
+++ b/api/api/xpack.rollup.delete_job.js
@@ -107,6 +107,7 @@ function buildXpackRollupDeleteJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.rollup.get_jobs.js b/api/api/xpack.rollup.get_jobs.js
index 25a150d0e..cb67e3e54 100644
--- a/api/api/xpack.rollup.get_jobs.js
+++ b/api/api/xpack.rollup.get_jobs.js
@@ -103,6 +103,7 @@ function buildXpackRollupGetJobs (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.rollup.get_rollup_caps.js b/api/api/xpack.rollup.get_rollup_caps.js
index dfe09cce4..1e2a1d5b5 100644
--- a/api/api/xpack.rollup.get_rollup_caps.js
+++ b/api/api/xpack.rollup.get_rollup_caps.js
@@ -103,6 +103,7 @@ function buildXpackRollupGetRollupCaps (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.rollup.get_rollup_index_caps.js b/api/api/xpack.rollup.get_rollup_index_caps.js
index 6b7846b72..5b5ad3038 100644
--- a/api/api/xpack.rollup.get_rollup_index_caps.js
+++ b/api/api/xpack.rollup.get_rollup_index_caps.js
@@ -107,6 +107,7 @@ function buildXpackRollupGetRollupIndexCaps (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.rollup.put_job.js b/api/api/xpack.rollup.put_job.js
index d76625c51..cf6ba50d7 100644
--- a/api/api/xpack.rollup.put_job.js
+++ b/api/api/xpack.rollup.put_job.js
@@ -114,6 +114,7 @@ function buildXpackRollupPutJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.rollup.rollup_search.js b/api/api/xpack.rollup.rollup_search.js
index b006d127f..681c803b3 100644
--- a/api/api/xpack.rollup.rollup_search.js
+++ b/api/api/xpack.rollup.rollup_search.js
@@ -131,6 +131,7 @@ function buildXpackRollupRollupSearch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.rollup.start_job.js b/api/api/xpack.rollup.start_job.js
index 3701988c8..ea8a0e069 100644
--- a/api/api/xpack.rollup.start_job.js
+++ b/api/api/xpack.rollup.start_job.js
@@ -107,6 +107,7 @@ function buildXpackRollupStartJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.rollup.stop_job.js b/api/api/xpack.rollup.stop_job.js
index 4d132b641..5945a7e59 100644
--- a/api/api/xpack.rollup.stop_job.js
+++ b/api/api/xpack.rollup.stop_job.js
@@ -111,6 +111,7 @@ function buildXpackRollupStopJob (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.sql.clear_cursor.js b/api/api/xpack.sql.clear_cursor.js
index d1967d400..7bf825950 100644
--- a/api/api/xpack.sql.clear_cursor.js
+++ b/api/api/xpack.sql.clear_cursor.js
@@ -107,6 +107,7 @@ function buildXpackSqlClearCursor (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.sql.query.js b/api/api/xpack.sql.query.js
index 80d95b181..67087514e 100644
--- a/api/api/xpack.sql.query.js
+++ b/api/api/xpack.sql.query.js
@@ -108,6 +108,7 @@ function buildXpackSqlQuery (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.sql.translate.js b/api/api/xpack.sql.translate.js
index 15c544835..684f57905 100644
--- a/api/api/xpack.sql.translate.js
+++ b/api/api/xpack.sql.translate.js
@@ -107,6 +107,7 @@ function buildXpackSqlTranslate (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.usage.js b/api/api/xpack.usage.js
index 61a6b8d86..90af1be13 100644
--- a/api/api/xpack.usage.js
+++ b/api/api/xpack.usage.js
@@ -107,6 +107,7 @@ function buildXpackUsage (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.ack_watch.js b/api/api/xpack.watcher.ack_watch.js
index 2284c7098..ede9615ec 100644
--- a/api/api/xpack.watcher.ack_watch.js
+++ b/api/api/xpack.watcher.ack_watch.js
@@ -126,6 +126,7 @@ function buildXpackWatcherAckWatch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.activate_watch.js b/api/api/xpack.watcher.activate_watch.js
index ae5a81497..ba22813ca 100644
--- a/api/api/xpack.watcher.activate_watch.js
+++ b/api/api/xpack.watcher.activate_watch.js
@@ -113,6 +113,7 @@ function buildXpackWatcherActivateWatch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.deactivate_watch.js b/api/api/xpack.watcher.deactivate_watch.js
index fa9cdf434..6ae2c9712 100644
--- a/api/api/xpack.watcher.deactivate_watch.js
+++ b/api/api/xpack.watcher.deactivate_watch.js
@@ -113,6 +113,7 @@ function buildXpackWatcherDeactivateWatch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.delete_watch.js b/api/api/xpack.watcher.delete_watch.js
index cdddf8bd7..66fbba1a4 100644
--- a/api/api/xpack.watcher.delete_watch.js
+++ b/api/api/xpack.watcher.delete_watch.js
@@ -113,6 +113,7 @@ function buildXpackWatcherDeleteWatch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.execute_watch.js b/api/api/xpack.watcher.execute_watch.js
index 034e2d218..8c0e7db1f 100644
--- a/api/api/xpack.watcher.execute_watch.js
+++ b/api/api/xpack.watcher.execute_watch.js
@@ -105,6 +105,7 @@ function buildXpackWatcherExecuteWatch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.get_watch.js b/api/api/xpack.watcher.get_watch.js
index 98f6db827..e1bfb5b92 100644
--- a/api/api/xpack.watcher.get_watch.js
+++ b/api/api/xpack.watcher.get_watch.js
@@ -113,6 +113,7 @@ function buildXpackWatcherGetWatch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.put_watch.js b/api/api/xpack.watcher.put_watch.js
index 6dd39a603..1d4442327 100644
--- a/api/api/xpack.watcher.put_watch.js
+++ b/api/api/xpack.watcher.put_watch.js
@@ -116,6 +116,7 @@ function buildXpackWatcherPutWatch (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.start.js b/api/api/xpack.watcher.start.js
index 5b4b227cc..c4b8c0ec9 100644
--- a/api/api/xpack.watcher.start.js
+++ b/api/api/xpack.watcher.start.js
@@ -106,6 +106,7 @@ function buildXpackWatcherStart (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.stats.js b/api/api/xpack.watcher.stats.js
index 29e68ec6c..05882a9b8 100644
--- a/api/api/xpack.watcher.stats.js
+++ b/api/api/xpack.watcher.stats.js
@@ -114,6 +114,7 @@ function buildXpackWatcherStats (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/api/api/xpack.watcher.stop.js b/api/api/xpack.watcher.stop.js
index 363f2b2f4..aec707664 100644
--- a/api/api/xpack.watcher.stop.js
+++ b/api/api/xpack.watcher.stop.js
@@ -106,6 +106,7 @@ function buildXpackWatcherStop (opts) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/docs/usage.asciidoc b/docs/usage.asciidoc
index 5ef2f63df..07441e78d 100644
--- a/docs/usage.asciidoc
+++ b/docs/usage.asciidoc
@@ -159,6 +159,10 @@ _Default:_ `false`
 |`headers`
 |`object` - Custom headers for the request. +
 _Default:_ `null`
+
+|`querystring`
+|`object` - Custom querystring for the request. +
+_Default:_ `null`
 |===
 
 === Error handling
diff --git a/lib/Transport.d.ts b/lib/Transport.d.ts
index 8037ae2f9..28033e292 100644
--- a/lib/Transport.d.ts
+++ b/lib/Transport.d.ts
@@ -80,9 +80,9 @@ declare type anyObject = {
 export interface TransportRequestParams {
   method: string;
   path: string;
-  body?: anyObject,
-  bulkBody?: anyObject,
-  querystring: anyObject
+  body?: anyObject;
+  bulkBody?: anyObject;
+  querystring?: anyObject;
 }
 
 export interface TransportRequestOptions {
@@ -91,6 +91,7 @@ export interface TransportRequestOptions {
   maxRetries?: number;
   asStream?: boolean;
   headers?: anyObject;
+  querystring?: anyObject;
   compression?: string;
   warnings?: [string];
 }
diff --git a/lib/Transport.js b/lib/Transport.js
index 61ee70c44..7bbc90412 100644
--- a/lib/Transport.js
+++ b/lib/Transport.js
@@ -166,7 +166,13 @@ class Transport {
 
       params.headers = headers
       // serializes the querystring
-      params.querystring = this.serializer.qserialize(params.querystring)
+      if (options.querystring == null) {
+        params.querystring = this.serializer.qserialize(params.querystring)
+      } else {
+        params.querystring = this.serializer.qserialize(
+          Object.assign({}, params.querystring, options.querystring)
+        )
+      }
 
       meta.request.params = params
       meta.request.options = options
diff --git a/scripts/utils/generate.js b/scripts/utils/generate.js
index 742c41f64..865925a48 100644
--- a/scripts/utils/generate.js
+++ b/scripts/utils/generate.js
@@ -160,6 +160,7 @@ function generate (spec, common) {
       maxRetries: options.maxRetries || null,
       asStream: options.asStream || false,
       headers: options.headers || null,
+      querystring: options.querystring || null,
       compression: options.compression || false,
       warnings
     }
diff --git a/test/types/index.ts b/test/types/index.ts
index fd1260bab..20705bad1 100644
--- a/test/types/index.ts
+++ b/test/types/index.ts
@@ -59,7 +59,11 @@ client.index({
 }, {
   maxRetries: 2,
   ignore: [404],
-  requestTimeout: 2000
+  requestTimeout: 2000,
+  headers: { foo: 'bar' },
+  querystring: { baz: 'faz' },
+  compression: 'gzip',
+  asStream: false
 }, (err: Error | null, result: ApiResponse) => {})
 
 // Promises
diff --git a/test/unit/api.test.js b/test/unit/api.test.js
index 61cc49a01..96e7fa701 100644
--- a/test/unit/api.test.js
+++ b/test/unit/api.test.js
@@ -269,6 +269,32 @@ test('Pass unknown parameters as query parameters (and get a warning)', t => {
   })
 })
 
+test('If the API uses the same key for both url and query parameter, the url should win', t => {
+  t.plan(2)
+
+  function handler (req, res) {
+    t.strictEqual(req.url, '/index/type/_bulk')
+    res.setHeader('Content-Type', 'application/json;utf=8')
+    res.end(JSON.stringify({ hello: 'world' }))
+  }
+
+  buildServer(handler, ({ port }, server) => {
+    const client = new Client({
+      node: `http://localhost:${port}`
+    })
+
+    // bulk has two `type` parameters
+    client.bulk({
+      index: 'index',
+      type: 'type',
+      body: []
+    }, (err, { body, warnings }) => {
+      t.error(err)
+      server.stop()
+    })
+  })
+})
+
 if (Number(process.version.split('.')[0].slice(1)) >= 8) {
   require('./api-async')(test)
 }
diff --git a/test/unit/transport.test.js b/test/unit/transport.test.js
index 7b15c72cc..c7c789950 100644
--- a/test/unit/transport.test.js
+++ b/test/unit/transport.test.js
@@ -2030,3 +2030,80 @@ test('nodeFilter and nodeSelector', t => {
     t.deepEqual(body, { hello: 'world' })
   })
 })
+
+test('Should accept custom querystring in the optons object', t => {
+  t.test('Options object', t => {
+    t.plan(3)
+
+    function handler (req, res) {
+      t.strictEqual(req.url, '/hello?foo=bar')
+      res.setHeader('Content-Type', 'application/json;utf=8')
+      res.end(JSON.stringify({ hello: 'world' }))
+    }
+
+    buildServer(handler, ({ port }, server) => {
+      const pool = new ConnectionPool({ Connection })
+      pool.addConnection(`http://localhost:${port}`)
+
+      const transport = new Transport({
+        emit: () => {},
+        connectionPool: pool,
+        serializer: new Serializer(),
+        maxRetries: 3,
+        requestTimeout: 30000,
+        sniffInterval: false,
+        sniffOnStart: false
+      })
+
+      transport.request({
+        method: 'GET',
+        path: '/hello'
+      }, {
+        querystring: { foo: 'bar' }
+      }, (err, { body }) => {
+        t.error(err)
+        t.deepEqual(body, { hello: 'world' })
+        server.stop()
+      })
+    })
+  })
+
+  t.test('Options object and params', t => {
+    t.plan(3)
+
+    function handler (req, res) {
+      t.strictEqual(req.url, '/hello?baz=faz&foo=bar')
+      res.setHeader('Content-Type', 'application/json;utf=8')
+      res.end(JSON.stringify({ hello: 'world' }))
+    }
+
+    buildServer(handler, ({ port }, server) => {
+      const pool = new ConnectionPool({ Connection })
+      pool.addConnection(`http://localhost:${port}`)
+
+      const transport = new Transport({
+        emit: () => {},
+        connectionPool: pool,
+        serializer: new Serializer(),
+        maxRetries: 3,
+        requestTimeout: 30000,
+        sniffInterval: false,
+        sniffOnStart: false
+      })
+
+      transport.request({
+        method: 'GET',
+        path: '/hello',
+        querystring: { baz: 'faz' }
+      }, {
+        querystring: { foo: 'bar' }
+      }, (err, { body }) => {
+        t.error(err)
+        t.deepEqual(body, { hello: 'world' })
+        server.stop()
+      })
+    })
+  })
+
+  t.end()
+})