diff --git a/docs/api_methods.asciidoc b/docs/api_methods.asciidoc
index 406c79ecd..c57ad3281 100644
--- a/docs/api_methods.asciidoc
+++ b/docs/api_methods.asciidoc
@@ -262,6 +262,8 @@ client.count(
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `minScore`::
 `Number` -- Include only documents with a specific `_score` value in the result
@@ -309,6 +311,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `percolateIndex`::
 `String` -- The index to count percolate the document into. Defaults to index.
@@ -548,6 +552,8 @@ Options:::
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `[replication=sync]`::
 `String` -- Specific replication type
@@ -1234,6 +1240,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `index`::
 `String` -- The index of the document being count percolated to use as default
@@ -1435,6 +1443,8 @@ client.percolate({
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `percolateFormat`::
 `String` -- Return an array of matching query IDs instead of objects
@@ -1688,6 +1698,8 @@ Options:::
 `Boolean` -- Specify whether to return detailed information about score computation as part of a hit
 `fields`::
 `String, String[], Boolean` -- A comma-separated list of fields to return as part of a hit
+`fielddataFields`::
+`String, String[], Boolean` -- A comma-separated list of fields to return as the field data representation of a field for each hit
 `from`::
 `Number` -- Starting offset (default: 0)
 `ignoreUnavailable`::
@@ -1699,6 +1711,8 @@ Options:::
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `indicesBoost`::
 `String, String[], Boolean` -- Comma-separated list of index boosts
@@ -1795,6 +1809,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `minScore`::
 `Number` -- Include only documents with a specific `_score` value in the result
@@ -1844,6 +1860,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `index`::
 `String` -- The name of the index
@@ -1879,6 +1897,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `preference`::
 `String` -- Specify the node or shard the operation should be performed on (default: random)
@@ -1963,6 +1983,8 @@ body: {
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `preference`::
 `String` -- Specify the node or shard the operation should be performed on (default: random)
@@ -2938,6 +2960,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `index`::
 `String, String[], Boolean` -- A comma-separated list of index name to limit the operation
@@ -2980,6 +3004,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `index`::
 `String` -- The name of the index
@@ -3177,6 +3203,8 @@ The default method is `HEAD` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `local`::
 `Boolean` -- Return local information, do not retrieve the state from master node (default: false)
@@ -3212,6 +3240,8 @@ The default method is `HEAD` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `local`::
 `Boolean` -- Return local information, do not retrieve the state from master node (default: false)
@@ -3274,6 +3304,8 @@ The default method is `HEAD` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `local`::
 `Boolean` -- Return local information, do not retrieve the state from master node (default: false)
@@ -3317,6 +3349,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `index`::
 `String, String[], Boolean` -- A comma-separated list of index names; use `_all` or empty string for all indices
@@ -3347,8 +3381,14 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 `Boolean` -- Ignore unavailable indexes (default: false)
 `allowNoIndices`::
 `Boolean` -- Ignore if a wildcard expression resolves to no concrete indices (default: false)
-`expandWildcards`::
-`String, String[], Boolean` -- Whether wildcard expressions should get expanded to open or closed indices (default: open)
+`[expandWildcards=open]`::
+`String` -- Whether wildcard expressions should get expanded to open or closed indices (default: open)
+Options:::
+ * `"open"`
+ * `"closed"`
+ * `"none"`
+ * `"all"`
+
 `index`::
 `String, String[], Boolean` -- A comma-separated list of index names
 `feature`::
@@ -3383,6 +3423,8 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `local`::
 `Boolean` -- Return local information, do not retrieve the state from master node (default: false)
@@ -3451,6 +3493,8 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `local`::
 `Boolean` -- Return local information, do not retrieve the state from master node (default: false)
@@ -3486,7 +3530,13 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 `allowNoIndices`::
 `Boolean` -- Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
 `[expandWildcards=open]`::
-`String, String[], Boolean` -- Whether to expand wildcard expression to concrete indices that are open, closed or both.
+`String` -- Whether to expand wildcard expression to concrete indices that are open, closed or both.
+Options:::
+ * `"open"`
+ * `"closed"`
+ * `"none"`
+ * `"all"`
+
 `local`::
 `Boolean` -- Return local information, do not retrieve the state from master node (default: false)
 `index`::
@@ -3523,6 +3573,8 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `flatSettings`::
 `Boolean` -- Return settings in flat format (default: false)
@@ -3589,6 +3641,8 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `human`::
 `Boolean` -- Whether to return time and byte values in human-readable format.
@@ -3624,6 +3678,8 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `local`::
 `Boolean` -- Return local information, do not retrieve the state from master node (default: false)
@@ -3667,6 +3723,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `index`::
 `String` -- The name of the index
@@ -3702,6 +3760,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `maxNumSegments`::
 `Number` -- The number of segments the index should be merged into (default: dynamic)
@@ -3780,6 +3840,8 @@ The default method is `PUT` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `index`::
 `String, String[], Boolean` -- A comma-separated list of index names the mapping should be added to (supports wildcards); use `_all` or omit to add the mapping on all indices.
@@ -3817,6 +3879,8 @@ The default method is `PUT` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `flatSettings`::
 `Boolean` -- Return settings in flat format (default: false)
@@ -3887,6 +3951,8 @@ The default method is `PUT` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `index`::
 `String, String[], Boolean` -- A comma-separated list of index names to register the warmer for; use `_all` or omit to perform the operation on all indices
@@ -3953,6 +4019,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `force`::
 `Boolean` -- Force a refresh even if not required
@@ -3990,6 +4058,8 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `human`::
 `Boolean` -- Whether to return time and byte values in human-readable format.
@@ -4071,6 +4141,8 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `human`::
 `Boolean` -- Whether to return time and byte values in human-readable format.
@@ -4148,6 +4220,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `ignoreUnavailable`::
 `Boolean` -- Whether specified concrete indices should be ignored when unavailable (missing or closed)
@@ -4187,6 +4261,8 @@ The default method is `POST` and the usual <<api-conventions,params and return v
 Options:::
  * `"open"`
  * `"closed"`
+ * `"none"`
+ * `"all"`
 
 `operationThreading`::
 `Anything` -- TODO: ?
diff --git a/docs/api_methods_1_3.asciidoc b/docs/api_methods_1_3.asciidoc
index 45a885c4d..4eeebffce 100644
--- a/docs/api_methods_1_3.asciidoc
+++ b/docs/api_methods_1_3.asciidoc
@@ -1656,6 +1656,8 @@ Options:::
 `Boolean` -- Specify whether to return detailed information about score computation as part of a hit
 `fields`::
 `String, String[], Boolean` -- A comma-separated list of fields to return as part of a hit
+`fielddataFields`::
+`String, String[], Boolean` -- A comma-separated list of fields to return as the field data representation of a field for each hit
 `from`::
 `Number` -- Starting offset (default: 0)
 `ignoreUnavailable`::
diff --git a/src/lib/apis/1_3.js b/src/lib/apis/1_3.js
index 88b4b60c5..8c81df6b4 100644
--- a/src/lib/apis/1_3.js
+++ b/src/lib/apis/1_3.js
@@ -4779,6 +4779,7 @@ api.scroll = ca({
  * @param {String} params.df - The field to use as default where no field prefix is given in the query string
  * @param {Boolean} params.explain - Specify whether to return detailed information about score computation as part of a hit
  * @param {String, String[], Boolean} params.fields - A comma-separated list of fields to return as part of a hit
+ * @param {String, String[], Boolean} params.fielddataFields - A comma-separated list of fields to return as the field data representation of a field for each hit
  * @param {Number} params.from - Starting offset (default: 0)
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
  * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
@@ -4835,6 +4836,10 @@ api.search = ca({
     fields: {
       type: 'list'
     },
+    fielddataFields: {
+      type: 'list',
+      name: 'fielddata_fields'
+    },
     from: {
       type: 'number'
     },
diff --git a/src/lib/apis/1_4.js b/src/lib/apis/1_4.js
index 7b1898ce8..be9b75f33 100644
--- a/src/lib/apis/1_4.js
+++ b/src/lib/apis/1_4.js
@@ -1043,7 +1043,9 @@ api.count = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -1126,7 +1128,9 @@ api.countPercolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -1316,7 +1320,9 @@ api.deleteByQuery = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2054,7 +2060,9 @@ api.indices.prototype.clearCache = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2118,7 +2126,9 @@ api.indices.prototype.close = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -2340,7 +2350,9 @@ api.indices.prototype.exists = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2388,7 +2400,9 @@ api.indices.prototype.existsAlias = ca({
       ],
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2478,7 +2492,9 @@ api.indices.prototype.existsType = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2537,7 +2553,9 @@ api.indices.prototype.flush = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -2565,7 +2583,7 @@ api.indices.prototype.flush = ca({
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {Boolean} params.ignoreUnavailable - Ignore unavailable indexes (default: false)
  * @param {Boolean} params.allowNoIndices - Ignore if a wildcard expression resolves to no concrete indices (default: false)
- * @param {String, String[], Boolean} params.expandWildcards - Whether wildcard expressions should get expanded to open or closed indices (default: open)
+ * @param {String} [params.expandWildcards=open] - Whether wildcard expressions should get expanded to open or closed indices (default: open)
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names
  * @param {String, String[], Boolean} params.feature - A comma-separated list of features
  */
@@ -2583,7 +2601,14 @@ api.indices.prototype.get = ca({
       name: 'allow_no_indices'
     },
     expandWildcards: {
-      type: 'list',
+      type: 'enum',
+      'default': 'open',
+      options: [
+        'open',
+        'closed',
+        'none',
+        'all'
+      ],
       name: 'expand_wildcards'
     }
   },
@@ -2636,7 +2661,9 @@ api.indices.prototype.getAlias = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2762,7 +2789,9 @@ api.indices.prototype.getFieldMapping = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2824,7 +2853,7 @@ api.indices.prototype.getFieldMapping = ca({
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
  * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
- * @param {String, String[], Boolean} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+ * @param {String} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names
  * @param {String, String[], Boolean} params.type - A comma-separated list of document types
@@ -2840,11 +2869,13 @@ api.indices.prototype.getMapping = ca({
       name: 'allow_no_indices'
     },
     expandWildcards: {
-      type: 'list',
+      type: 'enum',
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2916,7 +2947,9 @@ api.indices.prototype.getSettings = ca({
       ],
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3020,7 +3053,9 @@ api.indices.prototype.getUpgrade = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3071,7 +3106,9 @@ api.indices.prototype.getWarmer = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3160,7 +3197,9 @@ api.indices.prototype.open = ca({
       'default': 'closed',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3209,7 +3248,9 @@ api.indices.prototype.optimize = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3330,7 +3371,9 @@ api.indices.prototype.putMapping = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3390,7 +3433,9 @@ api.indices.prototype.putSettings = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3491,7 +3536,9 @@ api.indices.prototype.putWarmer = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3601,7 +3648,9 @@ api.indices.prototype.refresh = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3655,7 +3704,9 @@ api.indices.prototype.segments = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3831,7 +3882,9 @@ api.indices.prototype.status = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3909,7 +3962,9 @@ api.indices.prototype.upgrade = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3970,7 +4025,9 @@ api.indices.prototype.validateQuery = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -4232,7 +4289,9 @@ api.mpercolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -4810,7 +4869,9 @@ api.percolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5034,6 +5095,7 @@ api.scroll = ca({
  * @param {String} params.df - The field to use as default where no field prefix is given in the query string
  * @param {Boolean} params.explain - Specify whether to return detailed information about score computation as part of a hit
  * @param {String, String[], Boolean} params.fields - A comma-separated list of fields to return as part of a hit
+ * @param {String, String[], Boolean} params.fielddataFields - A comma-separated list of fields to return as the field data representation of a field for each hit
  * @param {Number} params.from - Starting offset (default: 0)
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
  * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
@@ -5092,6 +5154,10 @@ api.search = ca({
     fields: {
       type: 'list'
     },
+    fielddataFields: {
+      type: 'list',
+      name: 'fielddata_fields'
+    },
     from: {
       type: 'number'
     },
@@ -5108,7 +5174,9 @@ api.search = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5267,7 +5335,9 @@ api.searchExists = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5349,7 +5419,9 @@ api.searchShards = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -5410,7 +5482,9 @@ api.searchTemplate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5787,7 +5861,9 @@ api.suggest = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
diff --git a/src/lib/apis/1_x.js b/src/lib/apis/1_x.js
index 0296f63ee..5c4961bbf 100644
--- a/src/lib/apis/1_x.js
+++ b/src/lib/apis/1_x.js
@@ -966,6 +966,9 @@ api.cluster.prototype.reroute = ca({
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {Date, Number} params.masterTimeout - Specify timeout for connection to master
  * @param {Boolean} params.flatSettings - Return settings in flat format (default: false)
+ * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
+ * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
+ * @param {String} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
  * @param {String, String[], Boolean} params.metric - Limit the information returned to the specified metrics
  */
@@ -981,6 +984,25 @@ api.cluster.prototype.state = ca({
     flatSettings: {
       type: 'boolean',
       name: 'flat_settings'
+    },
+    ignoreUnavailable: {
+      type: 'boolean',
+      name: 'ignore_unavailable'
+    },
+    allowNoIndices: {
+      type: 'boolean',
+      name: 'allow_no_indices'
+    },
+    expandWildcards: {
+      type: 'enum',
+      'default': 'open',
+      options: [
+        'open',
+        'closed',
+        'none',
+        'all'
+      ],
+      name: 'expand_wildcards'
     }
   },
   urls: [
@@ -1090,7 +1112,9 @@ api.count = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -1173,7 +1197,9 @@ api.countPercolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -1363,7 +1389,9 @@ api.deleteByQuery = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2101,7 +2129,9 @@ api.indices.prototype.clearCache = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2165,7 +2195,9 @@ api.indices.prototype.close = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -2387,7 +2419,9 @@ api.indices.prototype.exists = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2435,7 +2469,9 @@ api.indices.prototype.existsAlias = ca({
       ],
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2525,7 +2561,9 @@ api.indices.prototype.existsType = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2584,7 +2622,9 @@ api.indices.prototype.flush = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -2612,7 +2652,7 @@ api.indices.prototype.flush = ca({
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {Boolean} params.ignoreUnavailable - Ignore unavailable indexes (default: false)
  * @param {Boolean} params.allowNoIndices - Ignore if a wildcard expression resolves to no concrete indices (default: false)
- * @param {String, String[], Boolean} params.expandWildcards - Whether wildcard expressions should get expanded to open or closed indices (default: open)
+ * @param {String} [params.expandWildcards=open] - Whether wildcard expressions should get expanded to open or closed indices (default: open)
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names
  * @param {String, String[], Boolean} params.feature - A comma-separated list of features
  */
@@ -2630,7 +2670,14 @@ api.indices.prototype.get = ca({
       name: 'allow_no_indices'
     },
     expandWildcards: {
-      type: 'list',
+      type: 'enum',
+      'default': 'open',
+      options: [
+        'open',
+        'closed',
+        'none',
+        'all'
+      ],
       name: 'expand_wildcards'
     }
   },
@@ -2683,7 +2730,9 @@ api.indices.prototype.getAlias = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2809,7 +2858,9 @@ api.indices.prototype.getFieldMapping = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2871,7 +2922,7 @@ api.indices.prototype.getFieldMapping = ca({
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
  * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
- * @param {String, String[], Boolean} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+ * @param {String} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names
  * @param {String, String[], Boolean} params.type - A comma-separated list of document types
@@ -2887,11 +2938,13 @@ api.indices.prototype.getMapping = ca({
       name: 'allow_no_indices'
     },
     expandWildcards: {
-      type: 'list',
+      type: 'enum',
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2963,7 +3016,9 @@ api.indices.prototype.getSettings = ca({
       ],
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3067,7 +3122,9 @@ api.indices.prototype.getUpgrade = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3118,7 +3175,9 @@ api.indices.prototype.getWarmer = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3207,7 +3266,9 @@ api.indices.prototype.open = ca({
       'default': 'closed',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3256,7 +3317,9 @@ api.indices.prototype.optimize = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3367,7 +3430,9 @@ api.indices.prototype.putMapping = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3427,7 +3492,9 @@ api.indices.prototype.putSettings = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3528,7 +3595,9 @@ api.indices.prototype.putWarmer = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3638,7 +3707,9 @@ api.indices.prototype.refresh = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3692,7 +3763,9 @@ api.indices.prototype.segments = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3868,7 +3941,9 @@ api.indices.prototype.status = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3946,7 +4021,9 @@ api.indices.prototype.upgrade = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -4007,7 +4084,9 @@ api.indices.prototype.validateQuery = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -4269,7 +4348,9 @@ api.mpercolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -4858,7 +4939,9 @@ api.percolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5082,6 +5165,7 @@ api.scroll = ca({
  * @param {String} params.df - The field to use as default where no field prefix is given in the query string
  * @param {Boolean} params.explain - Specify whether to return detailed information about score computation as part of a hit
  * @param {String, String[], Boolean} params.fields - A comma-separated list of fields to return as part of a hit
+ * @param {String, String[], Boolean} params.fielddataFields - A comma-separated list of fields to return as the field data representation of a field for each hit
  * @param {Number} params.from - Starting offset (default: 0)
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
  * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
@@ -5139,6 +5223,10 @@ api.search = ca({
     fields: {
       type: 'list'
     },
+    fielddataFields: {
+      type: 'list',
+      name: 'fielddata_fields'
+    },
     from: {
       type: 'number'
     },
@@ -5155,7 +5243,9 @@ api.search = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5310,7 +5400,9 @@ api.searchExists = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5392,7 +5484,9 @@ api.searchShards = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -5453,7 +5547,9 @@ api.searchTemplate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5830,7 +5926,9 @@ api.suggest = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
diff --git a/src/lib/apis/master.js b/src/lib/apis/master.js
index 713a1efdd..0b99d5a1a 100644
--- a/src/lib/apis/master.js
+++ b/src/lib/apis/master.js
@@ -1025,6 +1025,9 @@ api.cluster.prototype.reroute = ca({
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {Date, Number} params.masterTimeout - Specify timeout for connection to master
  * @param {Boolean} params.flatSettings - Return settings in flat format (default: false)
+ * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
+ * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
+ * @param {String} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
  * @param {String, String[], Boolean} params.metric - Limit the information returned to the specified metrics
  */
@@ -1040,6 +1043,25 @@ api.cluster.prototype.state = ca({
     flatSettings: {
       type: 'boolean',
       name: 'flat_settings'
+    },
+    ignoreUnavailable: {
+      type: 'boolean',
+      name: 'ignore_unavailable'
+    },
+    allowNoIndices: {
+      type: 'boolean',
+      name: 'allow_no_indices'
+    },
+    expandWildcards: {
+      type: 'enum',
+      'default': 'open',
+      options: [
+        'open',
+        'closed',
+        'none',
+        'all'
+      ],
+      name: 'expand_wildcards'
     }
   },
   urls: [
@@ -1149,7 +1171,9 @@ api.count = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -1232,7 +1256,9 @@ api.countPercolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -1422,7 +1448,9 @@ api.deleteByQuery = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2160,7 +2188,9 @@ api.indices.prototype.clearCache = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2224,7 +2254,9 @@ api.indices.prototype.close = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -2446,7 +2478,9 @@ api.indices.prototype.exists = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2494,7 +2528,9 @@ api.indices.prototype.existsAlias = ca({
       ],
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2584,7 +2620,9 @@ api.indices.prototype.existsType = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2643,7 +2681,9 @@ api.indices.prototype.flush = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -2671,7 +2711,7 @@ api.indices.prototype.flush = ca({
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {Boolean} params.ignoreUnavailable - Ignore unavailable indexes (default: false)
  * @param {Boolean} params.allowNoIndices - Ignore if a wildcard expression resolves to no concrete indices (default: false)
- * @param {String, String[], Boolean} params.expandWildcards - Whether wildcard expressions should get expanded to open or closed indices (default: open)
+ * @param {String} [params.expandWildcards=open] - Whether wildcard expressions should get expanded to open or closed indices (default: open)
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names
  * @param {String, String[], Boolean} params.feature - A comma-separated list of features
  */
@@ -2689,7 +2729,14 @@ api.indices.prototype.get = ca({
       name: 'allow_no_indices'
     },
     expandWildcards: {
-      type: 'list',
+      type: 'enum',
+      'default': 'open',
+      options: [
+        'open',
+        'closed',
+        'none',
+        'all'
+      ],
       name: 'expand_wildcards'
     }
   },
@@ -2742,7 +2789,9 @@ api.indices.prototype.getAlias = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2868,7 +2917,9 @@ api.indices.prototype.getFieldMapping = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -2930,7 +2981,7 @@ api.indices.prototype.getFieldMapping = ca({
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
  * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
- * @param {String, String[], Boolean} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+ * @param {String} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names
  * @param {String, String[], Boolean} params.type - A comma-separated list of document types
@@ -2946,11 +2997,13 @@ api.indices.prototype.getMapping = ca({
       name: 'allow_no_indices'
     },
     expandWildcards: {
-      type: 'list',
+      type: 'enum',
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3022,7 +3075,9 @@ api.indices.prototype.getSettings = ca({
       ],
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3126,7 +3181,9 @@ api.indices.prototype.getUpgrade = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3177,7 +3234,9 @@ api.indices.prototype.getWarmer = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3266,7 +3325,9 @@ api.indices.prototype.open = ca({
       'default': 'closed',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3314,7 +3375,9 @@ api.indices.prototype.optimize = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3422,7 +3485,9 @@ api.indices.prototype.putMapping = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3482,7 +3547,9 @@ api.indices.prototype.putSettings = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3583,7 +3650,9 @@ api.indices.prototype.putWarmer = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -3693,7 +3762,9 @@ api.indices.prototype.refresh = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3747,7 +3818,9 @@ api.indices.prototype.segments = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -3940,7 +4013,9 @@ api.indices.prototype.upgrade = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -4001,7 +4076,9 @@ api.indices.prototype.validateQuery = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -4297,7 +4374,9 @@ api.mpercolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -4900,7 +4979,9 @@ api.percolate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5124,6 +5205,7 @@ api.scroll = ca({
  * @param {String} params.df - The field to use as default where no field prefix is given in the query string
  * @param {Boolean} params.explain - Specify whether to return detailed information about score computation as part of a hit
  * @param {String, String[], Boolean} params.fields - A comma-separated list of fields to return as part of a hit
+ * @param {String, String[], Boolean} params.fielddataFields - A comma-separated list of fields to return as the field data representation of a field for each hit
  * @param {Number} params.from - Starting offset (default: 0)
  * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
  * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
@@ -5181,6 +5263,10 @@ api.search = ca({
     fields: {
       type: 'list'
     },
+    fielddataFields: {
+      type: 'list',
+      name: 'fielddata_fields'
+    },
     from: {
       type: 'number'
     },
@@ -5197,7 +5283,9 @@ api.search = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5352,7 +5440,9 @@ api.searchExists = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5434,7 +5524,9 @@ api.searchShards = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     }
@@ -5495,7 +5587,9 @@ api.searchTemplate = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },
@@ -5872,7 +5966,9 @@ api.suggest = ca({
       'default': 'open',
       options: [
         'open',
-        'closed'
+        'closed',
+        'none',
+        'all'
       ],
       name: 'expand_wildcards'
     },