diff --git a/compiler/src/steps/validate-model.ts b/compiler/src/steps/validate-model.ts
index d76149d0a2..be4500271f 100644
--- a/compiler/src/steps/validate-model.ts
+++ b/compiler/src/steps/validate-model.ts
@@ -644,11 +644,11 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma
       for (const parent of typeDef.behaviors) {
         validateTypeRef(parent.type, parent.generics, openGenerics)
 
-        if (parent.type.name === 'AdditionalProperty' && (parent.meta == null || parent.meta.name == null || parent.meta.value == null)) {
-          modelError(`AdditionalProperty behavior for type '${fqn(typeDef.name)}' requires a 'behavior_meta' decorator with at least 2 arguments (name of name, name of value, description)`)
+        if (parent.type.name === 'AdditionalProperty' && (parent.meta == null || parent.meta.key == null || parent.meta.value == null)) {
+          modelError(`AdditionalProperty behavior for type '${fqn(typeDef.name)}' requires a 'behavior_meta' decorator with at least 2 arguments (key, value)`)
         }
-        if (parent.type.name === 'AdditionalProperties' && (parent.meta == null || parent.meta.name == null || parent.meta.description == null)) {
-          modelError(`AdditionalProperties behavior for type '${fqn(typeDef.name)}' requires a 'behavior_meta' decorator with exactly 2 arguments (name, description)`)
+        if (parent.type.name === 'AdditionalProperties' && (parent.meta == null || parent.meta.fieldname == null || parent.meta.description == null)) {
+          modelError(`AdditionalProperties behavior for type '${fqn(typeDef.name)}' requires a 'behavior_meta' decorator with exactly 2 arguments (fieldname, description)`)
         }
       }
       context.pop()
diff --git a/docs/behaviors.md b/docs/behaviors.md
index f3efef2258..6b6701456e 100644
--- a/docs/behaviors.md
+++ b/docs/behaviors.md
@@ -16,7 +16,7 @@ We therefore document the requirement to behave like a dictionary for unknown pr
 
 ```ts
 /**
- * @behavior_meta AdditionalProperties name=sub_aggregations
+ * @behavior_meta AdditionalProperties fieldname=sub_aggregations
  */
 class IpRangeBucket implements AdditionalProperties<AggregateName, Aggregate> {}
 ```
@@ -25,7 +25,7 @@ There are also many places where we expect only one runtime-defined property, su
 
 ```ts
 /**
- * @behavior_meta AdditionalProperty name=field value=bounding_box
+ * @behavior_meta AdditionalProperty key=field value=bounding_box
  */
 class GeoBoundingBoxQuery extends QueryBase
   implements AdditionalProperty<Field, BoundingBox>
diff --git a/output/schema/schema.json b/output/schema/schema.json
index a2cd9efafc..6a7ea111e5 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -34990,7 +34990,7 @@
         }
       ],
       "shortcutProperty": "context",
-      "specLocation": "_global/search/_types/suggester.ts#L232-L261"
+      "specLocation": "_global/search/_types/suggester.ts#L235-L264"
     },
     {
       "generics": [
@@ -35295,7 +35295,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L160-L178"
+      "specLocation": "_global/search/_types/suggester.ts#L163-L181"
     },
     {
       "codegenNames": [
@@ -35310,7 +35310,7 @@
         "name": "Context",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L225-L230",
+      "specLocation": "_global/search/_types/suggester.ts#L228-L233",
       "type": {
         "items": [
           {
@@ -35478,7 +35478,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L265-L328"
+      "specLocation": "_global/search/_types/suggester.ts#L268-L331"
     },
     {
       "kind": "interface",
@@ -35856,7 +35856,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L106-L139",
+      "specLocation": "_global/search/_types/suggester.ts#L109-L142",
       "variants": {
         "kind": "container",
         "nonExhaustive": true
@@ -36955,7 +36955,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L427-L432"
+      "specLocation": "_global/search/_types/suggester.ts#L430-L435"
     },
     {
       "kind": "interface",
@@ -37039,7 +37039,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L434-L438"
+      "specLocation": "_global/search/_types/suggester.ts#L437-L441"
     },
     {
       "kind": "interface",
@@ -37178,7 +37178,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L330-L343"
+      "specLocation": "_global/search/_types/suggester.ts#L333-L346"
     },
     {
       "kind": "interface",
@@ -37212,7 +37212,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L345-L354"
+      "specLocation": "_global/search/_types/suggester.ts#L348-L357"
     },
     {
       "kind": "interface",
@@ -37246,7 +37246,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L416-L425"
+      "specLocation": "_global/search/_types/suggester.ts#L419-L428"
     },
     {
       "kind": "interface",
@@ -37477,7 +37477,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L356-L414"
+      "specLocation": "_global/search/_types/suggester.ts#L359-L417"
     },
     {
       "kind": "interface",
@@ -37867,7 +37867,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L180-L191"
+      "specLocation": "_global/search/_types/suggester.ts#L183-L194"
     },
     {
       "kind": "interface",
@@ -38162,7 +38162,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L442-L458",
+      "specLocation": "_global/search/_types/suggester.ts#L445-L461",
       "variants": {
         "kind": "container"
       }
@@ -38298,7 +38298,7 @@
         "name": "StringDistance",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L469-L490"
+      "specLocation": "_global/search/_types/suggester.ts#L472-L493"
     },
     {
       "kind": "interface",
@@ -38320,7 +38320,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L460-L465"
+      "specLocation": "_global/search/_types/suggester.ts#L463-L468"
     },
     {
       "generics": [
@@ -38492,7 +38492,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L193-L221"
+      "specLocation": "_global/search/_types/suggester.ts#L196-L224"
     },
     {
       "kind": "enum",
@@ -38510,7 +38510,7 @@
         "name": "SuggestSort",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L492-L501"
+      "specLocation": "_global/search/_types/suggester.ts#L495-L504"
     },
     {
       "attachedBehaviors": [
@@ -38534,6 +38534,10 @@
               }
             }
           ],
+          "meta": {
+            "description": "The named suggesters",
+            "fieldname": "suggesters"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -38559,7 +38563,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L101-L104"
+      "specLocation": "_global/search/_types/suggester.ts#L101-L107"
     },
     {
       "kind": "interface",
@@ -38605,7 +38609,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L141-L156"
+      "specLocation": "_global/search/_types/suggester.ts#L144-L159"
     },
     {
       "inherits": {
@@ -38879,7 +38883,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L503-L565"
+      "specLocation": "_global/search/_types/suggester.ts#L506-L568"
     },
     {
       "kind": "interface",
@@ -42473,7 +42477,7 @@
           }
         }
       ],
-      "specLocation": "_types/Errors.ts#L58-L64"
+      "specLocation": "_types/Errors.ts#L60-L66"
     },
     {
       "kind": "interface",
@@ -42806,7 +42810,7 @@
         "name": "ClusterInfoTarget",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L378-L384"
+      "specLocation": "_types/common.ts#L381-L387"
     },
     {
       "kind": "type_alias",
@@ -42814,7 +42818,7 @@
         "name": "ClusterInfoTargets",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L386-L386",
+      "specLocation": "_types/common.ts#L389-L389",
       "type": {
         "items": [
           {
@@ -43650,6 +43654,10 @@
               "kind": "user_defined_value"
             }
           ],
+          "meta": {
+            "description": "Additional details about the error",
+            "fieldname": "metadata"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -43739,7 +43747,7 @@
           }
         }
       ],
-      "specLocation": "_types/Errors.ts#L25-L48"
+      "specLocation": "_types/Errors.ts#L25-L50"
     },
     {
       "description": "The response returned by Elasticsearch when request execution did not succeed.",
@@ -44371,6 +44379,10 @@
               "kind": "union_of"
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "location"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -44439,7 +44451,7 @@
           }
         }
       ],
-      "specLocation": "_types/sort.ts#L58-L66"
+      "specLocation": "_types/sort.ts#L59-L70"
     },
     {
       "kind": "enum",
@@ -45380,7 +45392,7 @@
           }
         }
       ],
-      "specLocation": "_types/common.ts#L332-L359"
+      "specLocation": "_types/common.ts#L335-L362"
     },
     {
       "inherits": {
@@ -45427,6 +45439,10 @@
               "kind": "user_defined_value"
             }
           ],
+          "meta": {
+            "description": "Document metadata",
+            "fieldname": "metadata"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -45519,7 +45535,7 @@
           }
         }
       ],
-      "specLocation": "_types/common.ts#L321-L330"
+      "specLocation": "_types/common.ts#L320-L333"
     },
     {
       "inherits": {
@@ -48117,7 +48133,7 @@
           }
         }
       ],
-      "specLocation": "_types/sort.ts#L68-L74"
+      "specLocation": "_types/sort.ts#L72-L78"
     },
     {
       "kind": "enum",
@@ -48136,7 +48152,7 @@
         "name": "ScriptSortType",
         "namespace": "_types"
       },
-      "specLocation": "_types/sort.ts#L76-L80"
+      "specLocation": "_types/sort.ts#L80-L84"
     },
     {
       "kind": "interface",
@@ -48950,7 +48966,7 @@
           }
         }
       ],
-      "specLocation": "_types/Errors.ts#L50-L56"
+      "specLocation": "_types/Errors.ts#L52-L58"
     },
     {
       "kind": "interface",
@@ -49097,7 +49113,7 @@
         "name": "Slices",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L361-L366",
+      "specLocation": "_types/common.ts#L364-L369",
       "type": {
         "items": [
           {
@@ -49130,7 +49146,7 @@
         "name": "SlicesCalculation",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L368-L376"
+      "specLocation": "_types/common.ts#L371-L379"
     },
     {
       "kind": "type_alias",
@@ -49138,7 +49154,7 @@
         "name": "Sort",
         "namespace": "_types"
       },
-      "specLocation": "_types/sort.ts#L99-L99",
+      "specLocation": "_types/sort.ts#L104-L104",
       "type": {
         "items": [
           {
@@ -49172,7 +49188,7 @@
         "name": "SortCombinations",
         "namespace": "_types"
       },
-      "specLocation": "_types/sort.ts#L93-L97",
+      "specLocation": "_types/sort.ts#L98-L102",
       "type": {
         "items": [
           {
@@ -49216,7 +49232,7 @@
         "name": "SortMode",
         "namespace": "_types"
       },
-      "specLocation": "_types/sort.ts#L103-L112"
+      "specLocation": "_types/sort.ts#L108-L117"
     },
     {
       "attachedBehaviors": [
@@ -49240,6 +49256,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "sort"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -49299,7 +49319,7 @@
           }
         }
       ],
-      "specLocation": "_types/sort.ts#L82-L91",
+      "specLocation": "_types/sort.ts#L86-L96",
       "variants": {
         "kind": "container"
       }
@@ -49320,7 +49340,7 @@
         "name": "SortOrder",
         "namespace": "_types"
       },
-      "specLocation": "_types/sort.ts#L114-L123"
+      "specLocation": "_types/sort.ts#L119-L128"
     },
     {
       "kind": "type_alias",
@@ -49328,7 +49348,7 @@
         "name": "SortResults",
         "namespace": "_types"
       },
-      "specLocation": "_types/sort.ts#L101-L101",
+      "specLocation": "_types/sort.ts#L106-L106",
       "type": {
         "kind": "array_of",
         "value": {
@@ -49684,7 +49704,7 @@
           }
         }
       ],
-      "specLocation": "_types/Errors.ts#L66-L71"
+      "specLocation": "_types/Errors.ts#L68-L73"
     },
     {
       "kind": "type_alias",
@@ -50602,7 +50622,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L573-L575",
+      "specLocation": "_types/aggregations/Aggregate.ts#L577-L579",
       "variantName": "adjacency_matrix"
     },
     {
@@ -50684,7 +50704,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L577-L579"
+      "specLocation": "_types/aggregations/Aggregate.ts#L581-L583"
     },
     {
       "kind": "type_alias",
@@ -52539,7 +52559,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L356-L360",
+      "specLocation": "_types/aggregations/Aggregate.ts#L358-L362",
       "variantName": "auto_date_histogram"
     },
     {
@@ -52886,7 +52906,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L706-L722",
+      "specLocation": "_types/aggregations/Aggregate.ts#L713-L729",
       "variantName": "boxplot"
     },
     {
@@ -53802,7 +53822,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L776-L777",
+      "specLocation": "_types/aggregations/Aggregate.ts#L783-L784",
       "variantName": "children"
     },
     {
@@ -53867,7 +53887,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L618-L623",
+      "specLocation": "_types/aggregations/Aggregate.ts#L622-L627",
       "variantName": "composite"
     },
     {
@@ -54127,7 +54147,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L625-L627"
+      "specLocation": "_types/aggregations/Aggregate.ts#L629-L631"
     },
     {
       "inherits": {
@@ -54319,7 +54339,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L747-L755",
+      "specLocation": "_types/aggregations/Aggregate.ts#L754-L762",
       "variantName": "simple_long_value"
     },
     {
@@ -54423,7 +54443,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L348-L349",
+      "specLocation": "_types/aggregations/Aggregate.ts#L350-L351",
       "variantName": "date_histogram"
     },
     {
@@ -54696,7 +54716,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L351-L354"
+      "specLocation": "_types/aggregations/Aggregate.ts#L353-L356"
     },
     {
       "description": "Result of a `date_range` aggregation. Same format as a for a `range` aggregation: `from` and `to`\nin `buckets` are milliseconds since the Epoch, represented as a floating point number.",
@@ -54712,7 +54732,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L543-L548",
+      "specLocation": "_types/aggregations/Aggregate.ts#L547-L552",
       "variantName": "date_range"
     },
     {
@@ -55007,7 +55027,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L411-L416",
+      "specLocation": "_types/aggregations/Aggregate.ts#L413-L418",
       "variantName": "dterms"
     },
     {
@@ -55049,7 +55069,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L418-L421"
+      "specLocation": "_types/aggregations/Aggregate.ts#L420-L423"
     },
     {
       "kind": "interface",
@@ -55522,7 +55542,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L495-L496",
+      "specLocation": "_types/aggregations/Aggregate.ts#L499-L500",
       "variantName": "filter"
     },
     {
@@ -55547,7 +55567,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L568-L569",
+      "specLocation": "_types/aggregations/Aggregate.ts#L572-L573",
       "variantName": "filters"
     },
     {
@@ -55641,7 +55661,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L571-L571"
+      "specLocation": "_types/aggregations/Aggregate.ts#L575-L575"
     },
     {
       "inherits": {
@@ -55719,7 +55739,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L639-L640",
+      "specLocation": "_types/aggregations/Aggregate.ts#L643-L644",
       "variantName": "frequent_item_sets"
     },
     {
@@ -55851,7 +55871,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L642-L645"
+      "specLocation": "_types/aggregations/Aggregate.ts#L646-L649"
     },
     {
       "kind": "interface",
@@ -56068,7 +56088,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L550-L554",
+      "specLocation": "_types/aggregations/Aggregate.ts#L554-L558",
       "variantName": "geo_distance"
     },
     {
@@ -56174,7 +56194,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L506-L508",
+      "specLocation": "_types/aggregations/Aggregate.ts#L510-L512",
       "variantName": "geohash_grid"
     },
     {
@@ -56283,7 +56303,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L510-L512"
+      "specLocation": "_types/aggregations/Aggregate.ts#L514-L516"
     },
     {
       "inherits": {
@@ -56307,7 +56327,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L522-L523",
+      "specLocation": "_types/aggregations/Aggregate.ts#L526-L527",
       "variantName": "geohex_grid"
     },
     {
@@ -56338,7 +56358,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L525-L527"
+      "specLocation": "_types/aggregations/Aggregate.ts#L529-L531"
     },
     {
       "inherits": {
@@ -56383,7 +56403,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L784-L791",
+      "specLocation": "_types/aggregations/Aggregate.ts#L791-L798",
       "variantName": "geo_line"
     },
     {
@@ -56524,7 +56544,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L514-L516",
+      "specLocation": "_types/aggregations/Aggregate.ts#L518-L520",
       "variantName": "geotile_grid"
     },
     {
@@ -56633,7 +56653,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L518-L520"
+      "specLocation": "_types/aggregations/Aggregate.ts#L522-L524"
     },
     {
       "inherits": {
@@ -56729,7 +56749,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L492-L493",
+      "specLocation": "_types/aggregations/Aggregate.ts#L496-L497",
       "variantName": "global"
     },
     {
@@ -56845,7 +56865,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L340-L341",
+      "specLocation": "_types/aggregations/Aggregate.ts#L342-L343",
       "variantName": "histogram"
     },
     {
@@ -57052,7 +57072,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L343-L346"
+      "specLocation": "_types/aggregations/Aggregate.ts#L345-L348"
     },
     {
       "kind": "interface",
@@ -57268,6 +57288,10 @@
               "kind": "user_defined_value"
             }
           ],
+          "meta": {
+            "description": "Additional data",
+            "fieldname": "data"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -57337,7 +57361,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L659-L670",
+      "specLocation": "_types/aggregations/Aggregate.ts#L663-L677",
       "variantName": "inference"
     },
     {
@@ -57410,7 +57434,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L684-L687"
+      "specLocation": "_types/aggregations/Aggregate.ts#L691-L694"
     },
     {
       "kind": "interface",
@@ -57493,7 +57517,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L678-L682"
+      "specLocation": "_types/aggregations/Aggregate.ts#L685-L689"
     },
     {
       "kind": "interface",
@@ -57536,7 +57560,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L672-L676"
+      "specLocation": "_types/aggregations/Aggregate.ts#L679-L683"
     },
     {
       "inherits": {
@@ -57560,7 +57584,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L629-L630",
+      "specLocation": "_types/aggregations/Aggregate.ts#L633-L634",
       "variantName": "ip_prefix"
     },
     {
@@ -57715,7 +57739,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L632-L637"
+      "specLocation": "_types/aggregations/Aggregate.ts#L636-L641"
     },
     {
       "inherits": {
@@ -57739,7 +57763,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L556-L558",
+      "specLocation": "_types/aggregations/Aggregate.ts#L560-L562",
       "variantName": "ip_range"
     },
     {
@@ -57905,7 +57929,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L560-L564"
+      "specLocation": "_types/aggregations/Aggregate.ts#L564-L568"
     },
     {
       "kind": "type_alias",
@@ -58010,7 +58034,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L431-L436",
+      "specLocation": "_types/aggregations/Aggregate.ts#L433-L438",
       "variantName": "lrareterms"
     },
     {
@@ -58052,7 +58076,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L438-L441"
+      "specLocation": "_types/aggregations/Aggregate.ts#L440-L443"
     },
     {
       "description": "Result of a `terms` aggregation when the field is some kind of whole number like a integer, long, or a date.",
@@ -58077,7 +58101,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L399-L404",
+      "specLocation": "_types/aggregations/Aggregate.ts#L401-L406",
       "variantName": "lterms"
     },
     {
@@ -58119,7 +58143,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L406-L409"
+      "specLocation": "_types/aggregations/Aggregate.ts#L408-L411"
     },
     {
       "inherits": {
@@ -58211,7 +58235,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L757-L761",
+      "specLocation": "_types/aggregations/Aggregate.ts#L764-L768",
       "variantName": "matrix_stats"
     },
     {
@@ -58361,7 +58385,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L763-L772"
+      "specLocation": "_types/aggregations/Aggregate.ts#L770-L779"
     },
     {
       "inherits": {
@@ -58630,7 +58654,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L483-L484",
+      "specLocation": "_types/aggregations/Aggregate.ts#L487-L488",
       "variantName": "missing"
     },
     {
@@ -58961,6 +58985,10 @@
               }
             }
           ],
+          "meta": {
+            "description": "Nested aggregations",
+            "fieldname": "aggregations"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -58986,7 +59014,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L331-L338"
+      "specLocation": "_types/aggregations/Aggregate.ts#L331-L340"
     },
     {
       "kind": "interface",
@@ -59044,7 +59072,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L461-L463",
+      "specLocation": "_types/aggregations/Aggregate.ts#L463-L465",
       "variantName": "multi_terms"
     },
     {
@@ -59220,7 +59248,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L465-L469"
+      "specLocation": "_types/aggregations/Aggregate.ts#L467-L471"
     },
     {
       "kind": "interface",
@@ -59272,7 +59300,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L486-L487",
+      "specLocation": "_types/aggregations/Aggregate.ts#L490-L491",
       "variantName": "nested"
     },
     {
@@ -59382,7 +59410,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L779-L780",
+      "specLocation": "_types/aggregations/Aggregate.ts#L786-L787",
       "variantName": "parent"
     },
     {
@@ -59743,7 +59771,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L531-L532",
+      "specLocation": "_types/aggregations/Aggregate.ts#L535-L536",
       "variantName": "range"
     },
     {
@@ -59908,7 +59936,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L534-L541"
+      "specLocation": "_types/aggregations/Aggregate.ts#L538-L545"
     },
     {
       "inherits": {
@@ -60047,7 +60075,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L741-L745",
+      "specLocation": "_types/aggregations/Aggregate.ts#L748-L752",
       "variantName": "rate"
     },
     {
@@ -60125,7 +60153,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L489-L490",
+      "specLocation": "_types/aggregations/Aggregate.ts#L493-L494",
       "variantName": "reverse_nested"
     },
     {
@@ -60172,7 +60200,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L498-L499",
+      "specLocation": "_types/aggregations/Aggregate.ts#L502-L503",
       "variantName": "sampler"
     },
     {
@@ -60268,7 +60296,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L649-L652",
+      "specLocation": "_types/aggregations/Aggregate.ts#L653-L656",
       "variantName": "scripted_metric"
     },
     {
@@ -60404,7 +60432,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L588-L590",
+      "specLocation": "_types/aggregations/Aggregate.ts#L592-L594",
       "variantName": "siglterms"
     },
     {
@@ -60446,7 +60474,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L597-L600"
+      "specLocation": "_types/aggregations/Aggregate.ts#L601-L604"
     },
     {
       "inherits": {
@@ -60470,7 +60498,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L602-L604",
+      "specLocation": "_types/aggregations/Aggregate.ts#L606-L608",
       "variantName": "sigsterms"
     },
     {
@@ -60501,7 +60529,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L606-L608"
+      "specLocation": "_types/aggregations/Aggregate.ts#L610-L612"
     },
     {
       "generics": [
@@ -60554,7 +60582,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L581-L586"
+      "specLocation": "_types/aggregations/Aggregate.ts#L585-L590"
     },
     {
       "inherits": {
@@ -60792,7 +60820,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L592-L595"
+      "specLocation": "_types/aggregations/Aggregate.ts#L596-L599"
     },
     {
       "inherits": {
@@ -61088,6 +61116,10 @@
               }
             }
           ],
+          "meta": {
+            "description": "Nested aggregations",
+            "fieldname": "aggregations"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -61119,7 +61151,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L473-L481"
+      "specLocation": "_types/aggregations/Aggregate.ts#L475-L485"
     },
     {
       "inherits": {
@@ -61618,7 +61650,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L443-L447",
+      "specLocation": "_types/aggregations/Aggregate.ts#L445-L449",
       "variantName": "srareterms"
     },
     {
@@ -61649,7 +61681,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L449-L451"
+      "specLocation": "_types/aggregations/Aggregate.ts#L451-L453"
     },
     {
       "inherits": {
@@ -61835,7 +61867,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L693-L704",
+      "specLocation": "_types/aggregations/Aggregate.ts#L700-L711",
       "variantName": "string_stats"
     },
     {
@@ -61890,7 +61922,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L384-L389",
+      "specLocation": "_types/aggregations/Aggregate.ts#L386-L391",
       "variantName": "sterms"
     },
     {
@@ -61921,7 +61953,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L395-L397"
+      "specLocation": "_types/aggregations/Aggregate.ts#L397-L399"
     },
     {
       "description": "Sum aggregation result. `value` is always present and is zero if there were no values to process.",
@@ -62072,7 +62104,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L735-L739",
+      "specLocation": "_types/aggregations/Aggregate.ts#L742-L746",
       "variantName": "t_test"
     },
     {
@@ -62201,7 +62233,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L377-L382"
+      "specLocation": "_types/aggregations/Aggregate.ts#L379-L384"
     },
     {
       "inherits": {
@@ -62489,7 +62521,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L391-L393"
+      "specLocation": "_types/aggregations/Aggregate.ts#L393-L395"
     },
     {
       "codegenNames": [
@@ -62676,7 +62708,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L654-L657",
+      "specLocation": "_types/aggregations/Aggregate.ts#L658-L661",
       "variantName": "top_hits"
     },
     {
@@ -62941,7 +62973,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L729-L733"
+      "specLocation": "_types/aggregations/Aggregate.ts#L736-L740"
     },
     {
       "inherits": {
@@ -62971,7 +63003,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L724-L727",
+      "specLocation": "_types/aggregations/Aggregate.ts#L731-L734",
       "variantName": "top_metrics"
     },
     {
@@ -63087,7 +63119,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L453-L459",
+      "specLocation": "_types/aggregations/Aggregate.ts#L455-L461",
       "variantName": "umrareterms"
     },
     {
@@ -63106,7 +63138,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L501-L502",
+      "specLocation": "_types/aggregations/Aggregate.ts#L505-L506",
       "variantName": "unmapped_sampler"
     },
     {
@@ -63132,7 +63164,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L610-L616",
+      "specLocation": "_types/aggregations/Aggregate.ts#L614-L620",
       "variantName": "umsigterms"
     },
     {
@@ -63158,7 +63190,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L423-L429",
+      "specLocation": "_types/aggregations/Aggregate.ts#L425-L431",
       "variantName": "umterms"
     },
     {
@@ -63255,7 +63287,7 @@
         "namespace": "_types.aggregations"
       },
       "properties": [],
-      "specLocation": "_types/aggregations/Aggregate.ts#L362-L364",
+      "specLocation": "_types/aggregations/Aggregate.ts#L364-L366",
       "variantName": "variable_width_histogram"
     },
     {
@@ -63411,7 +63443,7 @@
           }
         }
       ],
-      "specLocation": "_types/aggregations/Aggregate.ts#L366-L373"
+      "specLocation": "_types/aggregations/Aggregate.ts#L368-L375"
     },
     {
       "inherits": {
@@ -75442,6 +75474,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "placement"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -75460,7 +75496,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/compound.ts#L186-L188"
+      "specLocation": "_types/query_dsl/compound.ts#L189-L194"
     },
     {
       "inherits": {
@@ -75638,7 +75674,7 @@
         "name": "DecayFunction",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/compound.ts#L194-L199",
+      "specLocation": "_types/query_dsl/compound.ts#L203-L208",
       "type": {
         "items": [
           {
@@ -76077,7 +76113,7 @@
         "name": "FieldValueFactorModifier",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/compound.ts#L298-L341"
+      "specLocation": "_types/query_dsl/compound.ts#L307-L350"
     },
     {
       "kind": "interface",
@@ -76170,7 +76206,7 @@
         "name": "FunctionBoostMode",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/compound.ts#L270-L296"
+      "specLocation": "_types/query_dsl/compound.ts#L279-L305"
     },
     {
       "esQuirk": "this container is valid without a variant. Despite being documented as a function, 'weight'\nis actually a container property that can be combined with a function. Comment in the ES code\n(SearchModule#registerScoreFunctions) says: Weight doesn't have its own parser, so every function\nsupports it out of the box. Can be a single function too when not associated to any other function,\nwhich is why it needs to be registered manually here.",
@@ -76277,7 +76313,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/compound.ts#L201-L241",
+      "specLocation": "_types/query_dsl/compound.ts#L210-L250",
       "variants": {
         "kind": "container"
       }
@@ -76314,7 +76350,7 @@
         "name": "FunctionScoreMode",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/compound.ts#L243-L268"
+      "specLocation": "_types/query_dsl/compound.ts#L252-L277"
     },
     {
       "inherits": {
@@ -76547,6 +76583,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "bounding_box"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -76607,7 +76647,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/geo.ts#L32-L50"
+      "specLocation": "_types/query_dsl/geo.ts#L32-L53"
     },
     {
       "attachedBehaviors": [
@@ -76647,6 +76687,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "placement"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -76665,7 +76709,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/compound.ts#L190-L192"
+      "specLocation": "_types/query_dsl/compound.ts#L196-L201"
     },
     {
       "inherits": {
@@ -76720,6 +76764,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "location"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -76792,7 +76840,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/geo.ts#L57-L85"
+      "specLocation": "_types/query_dsl/geo.ts#L60-L91"
     },
     {
       "kind": "enum",
@@ -76808,7 +76856,7 @@
         "name": "GeoExecution",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/geo.ts#L52-L55"
+      "specLocation": "_types/query_dsl/geo.ts#L55-L58"
     },
     {
       "kind": "interface",
@@ -76832,7 +76880,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/geo.ts#L87-L89"
+      "specLocation": "_types/query_dsl/geo.ts#L93-L95"
     },
     {
       "attachedBehaviors": [
@@ -76856,6 +76904,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "polygon"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -76902,7 +76954,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/geo.ts#L91-L99"
+      "specLocation": "_types/query_dsl/geo.ts#L97-L108"
     },
     {
       "kind": "interface",
@@ -76948,7 +77000,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/geo.ts#L106-L117"
+      "specLocation": "_types/query_dsl/geo.ts#L115-L126"
     },
     {
       "attachedBehaviors": [
@@ -76972,6 +77024,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "shape"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -77004,7 +77060,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/geo.ts#L121-L131"
+      "specLocation": "_types/query_dsl/geo.ts#L128-L143"
     },
     {
       "kind": "enum",
@@ -77025,7 +77081,7 @@
         "name": "GeoValidationMethod",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/geo.ts#L147-L157"
+      "specLocation": "_types/query_dsl/geo.ts#L159-L169"
     },
     {
       "inherits": {
@@ -79120,7 +79176,7 @@
         "name": "MultiValueMode",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/compound.ts#L343-L360"
+      "specLocation": "_types/query_dsl/compound.ts#L352-L369"
     },
     {
       "inherits": {
@@ -79350,6 +79406,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "placement"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -79368,7 +79428,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/compound.ts#L182-L184"
+      "specLocation": "_types/query_dsl/compound.ts#L182-L187"
     },
     {
       "kind": "enum",
@@ -81638,7 +81698,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/specialized.ts#L369-L373"
+      "specLocation": "_types/query_dsl/specialized.ts#L372-L376"
     },
     {
       "inherits": {
@@ -81826,7 +81886,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/specialized.ts#L354-L367"
+      "specLocation": "_types/query_dsl/specialized.ts#L357-L370"
     },
     {
       "attachedBehaviors": [
@@ -81850,6 +81910,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "shape"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -81881,7 +81945,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/specialized.ts#L344-L352"
+      "specLocation": "_types/query_dsl/specialized.ts#L342-L355"
     },
     {
       "kind": "enum",
@@ -82936,7 +83000,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L263-L268"
+      "specLocation": "_types/query_dsl/term.ts#L266-L271"
     },
     {
       "attachedBehaviors": [
@@ -82960,6 +83024,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "field",
+            "value": "term"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -82978,7 +83046,7 @@
         "namespace": "_types.query_dsl"
       },
       "properties": [],
-      "specLocation": "_types/query_dsl/term.ts#L254-L256"
+      "specLocation": "_types/query_dsl/term.ts#L254-L259"
     },
     {
       "codegenNames": [
@@ -82990,7 +83058,7 @@
         "name": "TermsQueryField",
         "namespace": "_types.query_dsl"
       },
-      "specLocation": "_types/query_dsl/term.ts#L258-L261",
+      "specLocation": "_types/query_dsl/term.ts#L261-L264",
       "type": {
         "items": [
           {
@@ -83177,7 +83245,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L270-L283"
+      "specLocation": "_types/query_dsl/term.ts#L273-L286"
     },
     {
       "inherits": {
@@ -83350,7 +83418,7 @@
           }
         }
       ],
-      "specLocation": "_types/query_dsl/term.ts#L285-L287"
+      "specLocation": "_types/query_dsl/term.ts#L288-L290"
     },
     {
       "inherits": {
@@ -83475,7 +83543,7 @@
         }
       ],
       "shortcutProperty": "value",
-      "specLocation": "_types/query_dsl/term.ts#L289-L306"
+      "specLocation": "_types/query_dsl/term.ts#L292-L309"
     },
     {
       "inherits": {
@@ -118437,7 +118505,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L405-L407"
+      "specLocation": "indices/_types/IndexSettings.ts#L407-L409"
     },
     {
       "kind": "interface",
@@ -119107,7 +119175,7 @@
         "name": "IndexCheckOnStartup",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L260-L267"
+      "specLocation": "indices/_types/IndexSettings.ts#L262-L269"
     },
     {
       "kind": "interface",
@@ -119553,7 +119621,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L252-L258"
+      "specLocation": "indices/_types/IndexSettings.ts#L254-L260"
     },
     {
       "attachedBehaviors": [
@@ -119573,6 +119641,10 @@
               "kind": "user_defined_value"
             }
           ],
+          "meta": {
+            "description": "Additional settings not covered in this type.",
+            "fieldname": "other_settings"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -120355,7 +120427,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L69-L167"
+      "specLocation": "indices/_types/IndexSettings.ts#L69-L169"
     },
     {
       "kind": "interface",
@@ -120475,7 +120547,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L317-L323"
+      "specLocation": "indices/_types/IndexSettings.ts#L319-L325"
     },
     {
       "kind": "interface",
@@ -120568,7 +120640,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L274-L307"
+      "specLocation": "indices/_types/IndexSettings.ts#L276-L309"
     },
     {
       "kind": "interface",
@@ -120590,7 +120662,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L309-L315"
+      "specLocation": "indices/_types/IndexSettings.ts#L311-L317"
     },
     {
       "kind": "interface",
@@ -120622,7 +120694,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L325-L328"
+      "specLocation": "indices/_types/IndexSettings.ts#L327-L330"
     },
     {
       "kind": "interface",
@@ -120979,7 +121051,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L269-L272"
+      "specLocation": "indices/_types/IndexSettings.ts#L271-L274"
     },
     {
       "kind": "interface",
@@ -121000,7 +121072,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L548-L550"
+      "specLocation": "indices/_types/IndexSettings.ts#L550-L552"
     },
     {
       "kind": "interface",
@@ -121022,7 +121094,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L552-L559"
+      "specLocation": "indices/_types/IndexSettings.ts#L554-L561"
     },
     {
       "kind": "interface",
@@ -121076,7 +121148,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L561-L566"
+      "specLocation": "indices/_types/IndexSettings.ts#L563-L568"
     },
     {
       "kind": "interface",
@@ -121100,7 +121172,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L568-L575"
+      "specLocation": "indices/_types/IndexSettings.ts#L570-L577"
     },
     {
       "kind": "enum",
@@ -121223,7 +121295,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L409-L422"
+      "specLocation": "indices/_types/IndexSettings.ts#L411-L424"
     },
     {
       "kind": "interface",
@@ -121246,7 +121318,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L443-L450"
+      "specLocation": "indices/_types/IndexSettings.ts#L445-L452"
     },
     {
       "kind": "interface",
@@ -121268,7 +121340,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L480-L486"
+      "specLocation": "indices/_types/IndexSettings.ts#L482-L488"
     },
     {
       "kind": "interface",
@@ -121290,7 +121362,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L471-L478"
+      "specLocation": "indices/_types/IndexSettings.ts#L473-L480"
     },
     {
       "kind": "interface",
@@ -121313,7 +121385,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L452-L460"
+      "specLocation": "indices/_types/IndexSettings.ts#L454-L462"
     },
     {
       "kind": "interface",
@@ -121336,7 +121408,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L462-L469"
+      "specLocation": "indices/_types/IndexSettings.ts#L464-L471"
     },
     {
       "kind": "interface",
@@ -121372,7 +121444,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L424-L441"
+      "specLocation": "indices/_types/IndexSettings.ts#L426-L443"
     },
     {
       "kind": "interface",
@@ -121393,7 +121465,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L330-L332"
+      "specLocation": "indices/_types/IndexSettings.ts#L332-L334"
     },
     {
       "kind": "interface",
@@ -121443,7 +121515,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L334-L337"
+      "specLocation": "indices/_types/IndexSettings.ts#L336-L339"
     },
     {
       "kind": "interface",
@@ -121501,7 +121573,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L401-L403"
+      "specLocation": "indices/_types/IndexSettings.ts#L403-L405"
     },
     {
       "kind": "interface",
@@ -121544,7 +121616,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L243-L246"
+      "specLocation": "indices/_types/IndexSettings.ts#L245-L248"
     },
     {
       "kind": "enum",
@@ -121637,7 +121709,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L233-L236"
+      "specLocation": "indices/_types/IndexSettings.ts#L235-L238"
     },
     {
       "kind": "interface",
@@ -121659,7 +121731,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L228-L231"
+      "specLocation": "indices/_types/IndexSettings.ts#L230-L233"
     },
     {
       "kind": "interface",
@@ -121689,7 +121761,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L248-L250"
+      "specLocation": "indices/_types/IndexSettings.ts#L250-L252"
     },
     {
       "kind": "interface",
@@ -121721,7 +121793,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L238-L241"
+      "specLocation": "indices/_types/IndexSettings.ts#L240-L243"
     },
     {
       "kind": "type_alias",
@@ -121729,7 +121801,7 @@
         "name": "SettingsSimilarity",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L169-L180",
+      "specLocation": "indices/_types/IndexSettings.ts#L171-L182",
       "type": {
         "items": [
           {
@@ -121845,7 +121917,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L186-L191"
+      "specLocation": "indices/_types/IndexSettings.ts#L188-L193"
     },
     {
       "kind": "interface",
@@ -121863,7 +121935,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L182-L184"
+      "specLocation": "indices/_types/IndexSettings.ts#L184-L186"
     },
     {
       "kind": "interface",
@@ -121892,7 +121964,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L193-L196"
+      "specLocation": "indices/_types/IndexSettings.ts#L195-L198"
     },
     {
       "kind": "interface",
@@ -121943,7 +122015,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L198-L203"
+      "specLocation": "indices/_types/IndexSettings.ts#L200-L205"
     },
     {
       "kind": "interface",
@@ -121994,7 +122066,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L205-L210"
+      "specLocation": "indices/_types/IndexSettings.ts#L207-L212"
     },
     {
       "kind": "interface",
@@ -122023,7 +122095,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L212-L215"
+      "specLocation": "indices/_types/IndexSettings.ts#L214-L217"
     },
     {
       "kind": "interface",
@@ -122052,7 +122124,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L217-L220"
+      "specLocation": "indices/_types/IndexSettings.ts#L219-L222"
     },
     {
       "kind": "interface",
@@ -122092,7 +122164,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L222-L226"
+      "specLocation": "indices/_types/IndexSettings.ts#L224-L228"
     },
     {
       "kind": "interface",
@@ -122146,7 +122218,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L488-L493"
+      "specLocation": "indices/_types/IndexSettings.ts#L490-L495"
     },
     {
       "kind": "interface",
@@ -122200,7 +122272,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L500-L505"
+      "specLocation": "indices/_types/IndexSettings.ts#L502-L507"
     },
     {
       "kind": "interface",
@@ -122232,7 +122304,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L495-L498"
+      "specLocation": "indices/_types/IndexSettings.ts#L497-L500"
     },
     {
       "kind": "interface",
@@ -122300,7 +122372,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L507-L516"
+      "specLocation": "indices/_types/IndexSettings.ts#L509-L518"
     },
     {
       "isOpen": true,
@@ -122327,7 +122399,7 @@
         "name": "StorageType",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L518-L546"
+      "specLocation": "indices/_types/IndexSettings.ts#L520-L548"
     },
     {
       "kind": "interface",
@@ -122484,7 +122556,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L339-L361"
+      "specLocation": "indices/_types/IndexSettings.ts#L341-L363"
     },
     {
       "kind": "enum",
@@ -122508,7 +122580,7 @@
         "name": "TranslogDurability",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L363-L378"
+      "specLocation": "indices/_types/IndexSettings.ts#L365-L380"
     },
     {
       "kind": "interface",
@@ -122544,7 +122616,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L380-L399"
+      "specLocation": "indices/_types/IndexSettings.ts#L382-L401"
     },
     {
       "kind": "enum",
@@ -122993,6 +123065,10 @@
               "kind": "user_defined_value"
             }
           ],
+          "meta": {
+            "description": "Additional tokenizer-specific attributes",
+            "fieldname": "attributes"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -123105,7 +123181,7 @@
           }
         }
       ],
-      "specLocation": "indices/analyze/types.ts#L52-L64"
+      "specLocation": "indices/analyze/types.ts#L52-L67"
     },
     {
       "attachedBehaviors": [
@@ -123319,7 +123395,7 @@
         "name": "TextToAnalyze",
         "namespace": "indices.analyze"
       },
-      "specLocation": "indices/analyze/types.ts#L66-L66",
+      "specLocation": "indices/analyze/types.ts#L69-L69",
       "type": {
         "items": [
           {
@@ -123376,7 +123452,7 @@
           }
         }
       ],
-      "specLocation": "indices/analyze/types.ts#L68-L71"
+      "specLocation": "indices/analyze/types.ts#L71-L74"
     },
     {
       "attachedBehaviors": [
@@ -125807,7 +125883,7 @@
           }
         }
       ],
-      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L54-L63"
+      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L57-L66"
     },
     {
       "attachedBehaviors": [
@@ -125831,6 +125907,10 @@
               }
             }
           ],
+          "meta": {
+            "description": "Per index statistics",
+            "fieldname": "stats"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -125855,7 +125935,7 @@
           }
         }
       ],
-      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L32-L36"
+      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L32-L39"
     },
     {
       "kind": "interface",
@@ -125942,7 +126022,7 @@
           }
         }
       ],
-      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L65-L73"
+      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L68-L76"
     },
     {
       "attachedBehaviors": [
@@ -126128,7 +126208,7 @@
           }
         }
       ],
-      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L49-L52"
+      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L52-L55"
     },
     {
       "kind": "interface",
@@ -126152,7 +126232,7 @@
           }
         }
       ],
-      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L38-L40"
+      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L41-L43"
     },
     {
       "kind": "interface",
@@ -126215,7 +126295,7 @@
           }
         }
       ],
-      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L42-L47"
+      "specLocation": "indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts#L45-L50"
     },
     {
       "attachedBehaviors": [
@@ -132362,6 +132442,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "node_id",
+            "value": "node"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -132408,7 +132492,7 @@
           }
         }
       ],
-      "specLocation": "indices/shard_stores/types.ts#L30-L34"
+      "specLocation": "indices/shard_stores/types.ts#L30-L37"
     },
     {
       "kind": "enum",
@@ -132427,7 +132511,7 @@
         "name": "ShardStoreAllocation",
         "namespace": "indices.shard_stores"
       },
-      "specLocation": "indices/shard_stores/types.ts#L45-L49"
+      "specLocation": "indices/shard_stores/types.ts#L48-L52"
     },
     {
       "kind": "interface",
@@ -132459,7 +132543,7 @@
           }
         }
       ],
-      "specLocation": "indices/shard_stores/types.ts#L51-L54"
+      "specLocation": "indices/shard_stores/types.ts#L54-L57"
     },
     {
       "kind": "interface",
@@ -132549,7 +132633,7 @@
           }
         }
       ],
-      "specLocation": "indices/shard_stores/types.ts#L36-L43"
+      "specLocation": "indices/shard_stores/types.ts#L39-L46"
     },
     {
       "kind": "enum",
@@ -132575,7 +132659,7 @@
         "name": "ShardStoreStatus",
         "namespace": "indices.shard_stores"
       },
-      "specLocation": "indices/shard_stores/types.ts#L60-L69"
+      "specLocation": "indices/shard_stores/types.ts#L63-L72"
     },
     {
       "kind": "interface",
@@ -132599,7 +132683,7 @@
           }
         }
       ],
-      "specLocation": "indices/shard_stores/types.ts#L56-L58"
+      "specLocation": "indices/shard_stores/types.ts#L59-L61"
     },
     {
       "attachedBehaviors": [
@@ -140666,6 +140750,10 @@
               }
             }
           ],
+          "meta": {
+            "description": "Additional metadata",
+            "fieldname": "metadata"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -140778,7 +140866,7 @@
           }
         }
       ],
-      "specLocation": "ingest/simulate/types.ts#L57-L85"
+      "specLocation": "ingest/simulate/types.ts#L57-L87"
     },
     {
       "kind": "interface",
@@ -172551,7 +172639,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L181-L183"
+      "specLocation": "nodes/info/types.ts#L184-L186"
     },
     {
       "kind": "interface",
@@ -172575,7 +172663,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L232-L234"
+      "specLocation": "nodes/info/types.ts#L235-L237"
     },
     {
       "kind": "interface",
@@ -172596,7 +172684,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L201-L203"
+      "specLocation": "nodes/info/types.ts#L204-L206"
     },
     {
       "kind": "interface",
@@ -172617,7 +172705,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L185-L187"
+      "specLocation": "nodes/info/types.ts#L188-L190"
     },
     {
       "attachedBehaviors": [
@@ -172637,6 +172725,10 @@
               "kind": "user_defined_value"
             }
           ],
+          "meta": {
+            "description": "Additional or alternative settings",
+            "fieldname": "settings"
+          },
           "type": {
             "name": "AdditionalProperties",
             "namespace": "_spec_utils"
@@ -172689,7 +172781,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L173-L179"
+      "specLocation": "nodes/info/types.ts#L173-L182"
     },
     {
       "kind": "interface",
@@ -172746,7 +172838,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L303-L308"
+      "specLocation": "nodes/info/types.ts#L306-L311"
     },
     {
       "kind": "interface",
@@ -172770,7 +172862,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L224-L226"
+      "specLocation": "nodes/info/types.ts#L227-L229"
     },
     {
       "kind": "interface",
@@ -172833,7 +172925,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L228-L230"
+      "specLocation": "nodes/info/types.ts#L231-L233"
     },
     {
       "kind": "interface",
@@ -172953,7 +173045,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L310-L321"
+      "specLocation": "nodes/info/types.ts#L313-L324"
     },
     {
       "kind": "interface",
@@ -172985,7 +173077,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L323-L326"
+      "specLocation": "nodes/info/types.ts#L326-L329"
     },
     {
       "kind": "interface",
@@ -173017,7 +173109,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L328-L331"
+      "specLocation": "nodes/info/types.ts#L331-L334"
     },
     {
       "kind": "interface",
@@ -173060,7 +173152,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L333-L337"
+      "specLocation": "nodes/info/types.ts#L336-L340"
     },
     {
       "kind": "interface",
@@ -173158,7 +173250,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L339-L348"
+      "specLocation": "nodes/info/types.ts#L342-L351"
     },
     {
       "kind": "interface",
@@ -173292,7 +173384,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L281-L284"
+      "specLocation": "nodes/info/types.ts#L284-L287"
     },
     {
       "kind": "interface",
@@ -173313,7 +173405,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L286-L288"
+      "specLocation": "nodes/info/types.ts#L289-L291"
     },
     {
       "kind": "interface",
@@ -173334,7 +173426,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L290-L292"
+      "specLocation": "nodes/info/types.ts#L293-L295"
     },
     {
       "kind": "interface",
@@ -173683,7 +173775,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L189-L194"
+      "specLocation": "nodes/info/types.ts#L192-L197"
     },
     {
       "kind": "interface",
@@ -173705,7 +173797,7 @@
         }
       ],
       "shortcutProperty": "default",
-      "specLocation": "nodes/info/types.ts#L196-L199"
+      "specLocation": "nodes/info/types.ts#L199-L202"
     },
     {
       "kind": "interface",
@@ -174110,7 +174202,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L220-L222"
+      "specLocation": "nodes/info/types.ts#L223-L225"
     },
     {
       "kind": "interface",
@@ -174203,7 +174295,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L205-L209"
+      "specLocation": "nodes/info/types.ts#L208-L212"
     },
     {
       "kind": "interface",
@@ -174224,7 +174316,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L216-L218"
+      "specLocation": "nodes/info/types.ts#L219-L221"
     },
     {
       "kind": "interface",
@@ -174246,7 +174338,7 @@
         }
       ],
       "shortcutProperty": "default",
-      "specLocation": "nodes/info/types.ts#L211-L214"
+      "specLocation": "nodes/info/types.ts#L214-L217"
     },
     {
       "kind": "interface",
@@ -174303,7 +174395,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L350-L354"
+      "specLocation": "nodes/info/types.ts#L353-L357"
     },
     {
       "kind": "interface",
@@ -174353,7 +174445,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L236-L240"
+      "specLocation": "nodes/info/types.ts#L239-L243"
     },
     {
       "kind": "interface",
@@ -174374,7 +174466,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L273-L275"
+      "specLocation": "nodes/info/types.ts#L276-L278"
     },
     {
       "kind": "interface",
@@ -174395,7 +174487,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L277-L279"
+      "specLocation": "nodes/info/types.ts#L280-L282"
     },
     {
       "kind": "interface",
@@ -174449,7 +174541,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L242-L247"
+      "specLocation": "nodes/info/types.ts#L245-L250"
     },
     {
       "kind": "interface",
@@ -174481,7 +174573,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L253-L256"
+      "specLocation": "nodes/info/types.ts#L256-L259"
     },
     {
       "kind": "interface",
@@ -174557,7 +174649,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L258-L262"
+      "specLocation": "nodes/info/types.ts#L261-L265"
     },
     {
       "kind": "interface",
@@ -174589,7 +174681,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L268-L271"
+      "specLocation": "nodes/info/types.ts#L271-L274"
     },
     {
       "kind": "interface",
@@ -174610,7 +174702,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L264-L266"
+      "specLocation": "nodes/info/types.ts#L267-L269"
     },
     {
       "kind": "interface",
@@ -174642,7 +174734,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L249-L251"
+      "specLocation": "nodes/info/types.ts#L252-L254"
     },
     {
       "kind": "interface",
@@ -174817,7 +174909,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L356-L370"
+      "specLocation": "nodes/info/types.ts#L359-L373"
     },
     {
       "kind": "interface",
@@ -174952,7 +175044,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L372-L389"
+      "specLocation": "nodes/info/types.ts#L375-L392"
     },
     {
       "kind": "interface",
@@ -175007,7 +175099,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L391-L398"
+      "specLocation": "nodes/info/types.ts#L394-L401"
     },
     {
       "kind": "interface",
@@ -175083,7 +175175,7 @@
           }
         }
       ],
-      "specLocation": "nodes/info/types.ts#L294-L301"
+      "specLocation": "nodes/info/types.ts#L297-L304"
     },
     {
       "attachedBehaviors": [
@@ -201349,6 +201441,10 @@
               }
             }
           ],
+          "meta": {
+            "key": "operator",
+            "value": "params"
+          },
           "type": {
             "name": "AdditionalProperty",
             "namespace": "_spec_utils"
@@ -201373,7 +201469,7 @@
           }
         }
       ],
-      "specLocation": "watcher/_types/Conditions.ts#L32-L36"
+      "specLocation": "watcher/_types/Conditions.ts#L32-L39"
     },
     {
       "kind": "interface",
@@ -201538,7 +201634,7 @@
           }
         }
       ],
-      "specLocation": "watcher/_types/Conditions.ts#L47-L59",
+      "specLocation": "watcher/_types/Conditions.ts#L50-L62",
       "variants": {
         "kind": "container"
       }
@@ -201569,7 +201665,7 @@
         "name": "ConditionOp",
         "namespace": "watcher._types"
       },
-      "specLocation": "watcher/_types/Conditions.ts#L38-L45"
+      "specLocation": "watcher/_types/Conditions.ts#L41-L48"
     },
     {
       "kind": "enum",
@@ -201594,7 +201690,7 @@
         "name": "ConditionType",
         "namespace": "watcher._types"
       },
-      "specLocation": "watcher/_types/Conditions.ts#L61-L67"
+      "specLocation": "watcher/_types/Conditions.ts#L64-L70"
     },
     {
       "kind": "enum",
@@ -203338,7 +203434,7 @@
         "namespace": "watcher._types"
       },
       "properties": [],
-      "specLocation": "watcher/_types/Conditions.ts#L69-L69"
+      "specLocation": "watcher/_types/Conditions.ts#L72-L72"
     },
     {
       "inherits": {
@@ -203649,7 +203745,7 @@
         "name": "Quantifier",
         "namespace": "watcher._types"
       },
-      "specLocation": "watcher/_types/Conditions.ts#L71-L74"
+      "specLocation": "watcher/_types/Conditions.ts#L74-L77"
     },
     {
       "kind": "interface",
@@ -204061,7 +204157,7 @@
           }
         }
       ],
-      "specLocation": "watcher/_types/Conditions.ts#L76-L84"
+      "specLocation": "watcher/_types/Conditions.ts#L79-L87"
     },
     {
       "kind": "interface",
diff --git a/specification/_global/search/_types/suggester.ts b/specification/_global/search/_types/suggester.ts
index 4e58d7404b..28ef9ab0d1 100644
--- a/specification/_global/search/_types/suggester.ts
+++ b/specification/_global/search/_types/suggester.ts
@@ -99,7 +99,7 @@ export class TermSuggestOption {
 }
 
 /**
- * @behavior_meta AdditionalProperties name=suggesters description="The named suggesters"
+ * @behavior_meta AdditionalProperties fieldname=suggesters description="The named suggesters"
  */
 export class Suggester implements AdditionalProperties<string, FieldSuggester> {
   /** Global suggest text, to avoid repetition when the same text is used in several suggesters */
diff --git a/specification/_types/Errors.ts b/specification/_types/Errors.ts
index 165ce2b883..5aee0838ab 100644
--- a/specification/_types/Errors.ts
+++ b/specification/_types/Errors.ts
@@ -26,7 +26,7 @@ import { AdditionalProperties } from '@spec_utils/behaviors'
  * Cause and details about a request failure. This class defines the properties common to all error types.
  * Additional details are also provided, that depend on the error type.
  *
- * @behavior_meta AdditionalProperties name=metadata description="Additional details about the error"
+ * @behavior_meta AdditionalProperties fieldname=metadata description="Additional details about the error"
  */
 export class ErrorCause
   implements AdditionalProperties<string, UserDefinedValue>
diff --git a/specification/_types/aggregations/Aggregate.ts b/specification/_types/aggregations/Aggregate.ts
index 32a5a3d6d5..2e6e724e59 100644
--- a/specification/_types/aggregations/Aggregate.ts
+++ b/specification/_types/aggregations/Aggregate.ts
@@ -331,7 +331,7 @@ export class MultiBucketAggregateBase<TBucket> extends AggregateBase {
 /**
  * Base type for multi-bucket aggregation results that can hold sub-aggregations results.
  *
- * @behavior_meta AdditionalProperties name=aggregations description="Nested aggregations"
+ * @behavior_meta AdditionalProperties fieldname=aggregations description="Nested aggregations"
  */
 export class MultiBucketBase
   implements AdditionalProperties<AggregateName, Aggregate>
@@ -475,7 +475,7 @@ export class MultiTermsBucket extends MultiBucketBase {
 /**
  * Base type for single-bucket aggregation results that can hold sub-aggregations results.
  *
- * @behavior_meta AdditionalProperties name=aggregations description="Nested aggregations"
+ * @behavior_meta AdditionalProperties fieldname=aggregations description="Nested aggregations"
  */
 export class SingleBucketAggregateBase
   extends AggregateBase
@@ -662,7 +662,7 @@ export class TopHitsAggregate extends AggregateBase {
 
 /**
  * @variant name=inference
- * @behavior_meta AdditionalProperties name=data description="Additional data"
+ * @behavior_meta AdditionalProperties fieldname=data description="Additional data"
  */
 // This is a union with widely different fields, many of them being runtime-defined. We mimic below the few fields
 // present in `ParsedInference` with an additional properties spillover to not loose any data.
diff --git a/specification/_types/common.ts b/specification/_types/common.ts
index 00904983a2..35e68674b4 100644
--- a/specification/_types/common.ts
+++ b/specification/_types/common.ts
@@ -318,7 +318,7 @@ export enum WaitForEvents {
 }
 
 /**
- * @behavior_meta AdditionalProperties name=metadata description="Document metadata"
+ * @behavior_meta AdditionalProperties fieldname=metadata description="Document metadata"
  */
 // Additional properties are the meta fields
 export class InlineGet<TDocument>
diff --git a/specification/_types/query_dsl/compound.ts b/specification/_types/query_dsl/compound.ts
index ff2f5c717c..d613b08a76 100644
--- a/specification/_types/query_dsl/compound.ts
+++ b/specification/_types/query_dsl/compound.ts
@@ -180,21 +180,21 @@ export class DecayFunctionBase {
 }
 
 /**
- * @behavior_meta AdditionalProperty name=field value=placement
+ * @behavior_meta AdditionalProperty key=field value=placement
  */
 export class NumericDecayFunction
   extends DecayFunctionBase
   implements AdditionalProperty<Field, DecayPlacement<double, double>> {}
 
 /**
- * @behavior_meta AdditionalProperty name=field value=placement
+ * @behavior_meta AdditionalProperty key=field value=placement
  */
 export class DateDecayFunction
   extends DecayFunctionBase
   implements AdditionalProperty<Field, DecayPlacement<DateMath, Duration>> {}
 
 /**
- * @behavior_meta AdditionalProperty name=field value=placement
+ * @behavior_meta AdditionalProperty key=field value=placement
  */
 export class GeoDecayFunction
   extends DecayFunctionBase
diff --git a/specification/_types/query_dsl/geo.ts b/specification/_types/query_dsl/geo.ts
index c2566aba92..5adca586c4 100644
--- a/specification/_types/query_dsl/geo.ts
+++ b/specification/_types/query_dsl/geo.ts
@@ -30,7 +30,7 @@ import { FieldLookup, QueryBase } from './abstractions'
 import { Field } from '@_types/common'
 
 /**
- * @behavior_meta AdditionalProperty name=field value=bounding_box
+ * @behavior_meta AdditionalProperty key=field value=bounding_box
  */
 export class GeoBoundingBoxQuery
   extends QueryBase
@@ -58,7 +58,7 @@ export enum GeoExecution {
 }
 
 /**
- * @behavior_meta AdditionalProperty name=field value=location
+ * @behavior_meta AdditionalProperty key=field value=location
  */
 export class GeoDistanceQuery
   extends QueryBase
@@ -96,7 +96,7 @@ export class GeoPolygonPoints {
 
 /**
  * @deprecated 7.12.0 Use geo-shape instead.
- * @behavior_meta AdditionalProperty name=field value=polygon
+ * @behavior_meta AdditionalProperty key=field value=polygon
  */
 export class GeoPolygonQuery
   extends QueryBase
@@ -126,7 +126,7 @@ export class GeoShapeFieldQuery {
 }
 
 /**
- * @behavior_meta AdditionalProperty name=field value=shape
+ * @behavior_meta AdditionalProperty key=field value=shape
  */
 // GeoShape query doesn't follow the common pattern of having a single field-name property
 // holding also the query base fields (boost and _name)
diff --git a/specification/_types/query_dsl/specialized.ts b/specification/_types/query_dsl/specialized.ts
index c353c08a6e..6dcf67901e 100644
--- a/specification/_types/query_dsl/specialized.ts
+++ b/specification/_types/query_dsl/specialized.ts
@@ -340,7 +340,7 @@ export class ScriptScoreQuery extends QueryBase {
 }
 
 /**
- * @behavior_meta AdditionalProperty name=field value=shape
+ * @behavior_meta AdditionalProperty key=field value=shape
  */
 // Shape query doesn't follow the common pattern of having a single field-name property
 // holding also the query base fields (boost and _name)
diff --git a/specification/_types/query_dsl/term.ts b/specification/_types/query_dsl/term.ts
index 61e4ca0bf0..c43d09e156 100644
--- a/specification/_types/query_dsl/term.ts
+++ b/specification/_types/query_dsl/term.ts
@@ -252,7 +252,7 @@ export class TermQuery extends QueryBase {
 }
 
 /**
- * @behavior_meta AdditionalProperty name=field value=term
+ * @behavior_meta AdditionalProperty key=field value=term
  */
 export class TermsQuery
   extends QueryBase
diff --git a/specification/_types/sort.ts b/specification/_types/sort.ts
index 5bbdc3aa08..ed32556886 100644
--- a/specification/_types/sort.ts
+++ b/specification/_types/sort.ts
@@ -57,7 +57,7 @@ export class ScoreSort {
 }
 
 /**
- * @behavior_meta AdditionalProperty name=field value=location
+ * @behavior_meta AdditionalProperty key=field value=location
  */
 export class GeoDistanceSort
   implements AdditionalProperty<Field, GeoLocation | GeoLocation[]>
@@ -86,7 +86,7 @@ export enum ScriptSortType {
 /**
  * @doc_id sort-search-results
  * @variants container
- * @behavior_meta AdditionalProperty name=field value=sort
+ * @behavior_meta AdditionalProperty key=field value=sort
  */
 export class SortOptions implements AdditionalProperty<Field, FieldSort> {
   _score?: ScoreSort
diff --git a/specification/indices/_types/IndexSettings.ts b/specification/indices/_types/IndexSettings.ts
index ced5de4717..5cc0c2cfd6 100644
--- a/specification/indices/_types/IndexSettings.ts
+++ b/specification/indices/_types/IndexSettings.ts
@@ -69,7 +69,7 @@ export class RetentionLease {
 /**
  * @doc_id index-modules-settings
  *
- * @behavior_meta AdditionalProperties name=other_settings description="Additional settings not covered in this type."
+ * @behavior_meta AdditionalProperties fieldname=other_settings description="Additional settings not covered in this type."
  */
 export class IndexSettings
   implements AdditionalProperties<string, UserDefinedValue>
diff --git a/specification/indices/analyze/types.ts b/specification/indices/analyze/types.ts
index 38947eb9c4..842cdb2739 100644
--- a/specification/indices/analyze/types.ts
+++ b/specification/indices/analyze/types.ts
@@ -50,7 +50,7 @@ export class CharFilterDetail {
 
 // Additional properties are attributes that can be set by plugin-defined tokenizers
 /**
- * @behavior_meta AdditionalProperties name=attributes description="Additional tokenizer-specific attributes"
+ * @behavior_meta AdditionalProperties fieldname=attributes description="Additional tokenizer-specific attributes"
  */
 export class ExplainAnalyzeToken
   implements AdditionalProperties<string, UserDefinedValue>
diff --git a/specification/indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts b/specification/indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts
index ae2eda584d..95ceb23e35 100644
--- a/specification/indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts
+++ b/specification/indices/field_usage_stats/IndicesFieldUsageStatsResponse.ts
@@ -30,7 +30,7 @@ export class Response {
 }
 
 /**
- * @behavior_meta AdditionalProperties name=stats description="Per index statistics"
+ * @behavior_meta AdditionalProperties fieldname=stats description="Per index statistics"
  */
 export class FieldsUsageBody
   implements AdditionalProperties<IndexName, UsageStatsIndex>
diff --git a/specification/indices/shard_stores/types.ts b/specification/indices/shard_stores/types.ts
index a059baf21a..f5e115426c 100644
--- a/specification/indices/shard_stores/types.ts
+++ b/specification/indices/shard_stores/types.ts
@@ -28,7 +28,7 @@ export class IndicesShardStores {
 }
 
 /**
- * @behavior_meta AdditionalProperty name=node_id value=node
+ * @behavior_meta AdditionalProperty key=node_id value=node
  */
 export class ShardStore implements AdditionalProperty<NodeId, ShardStoreNode> {
   allocation: ShardStoreAllocation
diff --git a/specification/ingest/simulate/types.ts b/specification/ingest/simulate/types.ts
index d05a4c5027..0950358f8d 100644
--- a/specification/ingest/simulate/types.ts
+++ b/specification/ingest/simulate/types.ts
@@ -57,7 +57,7 @@ export class Document {
 /**
  * The simulated document, with optional metadata.
  *
- * @behavior_meta AdditionalProperties name=metadata description="Additional metadata"
+ * @behavior_meta AdditionalProperties fieldname=metadata description="Additional metadata"
  */
 export class DocumentSimulation
   implements AdditionalProperties<string, string>
diff --git a/specification/nodes/info/types.ts b/specification/nodes/info/types.ts
index c946d0aa9c..5a7a8ab53d 100644
--- a/specification/nodes/info/types.ts
+++ b/specification/nodes/info/types.ts
@@ -171,7 +171,7 @@ export class NodeInfoRepositoriesUrl {
 }
 
 /**
- * @behavior_meta AdditionalProperties name=settings description="Additional or alternative settings"
+ * @behavior_meta AdditionalProperties fieldname=settings description="Additional or alternative settings"
  */
 export class NodeInfoDiscover
   implements AdditionalProperties<string, UserDefinedValue>
diff --git a/specification/watcher/_types/Conditions.ts b/specification/watcher/_types/Conditions.ts
index 9b4c41fb91..9b459c8130 100644
--- a/specification/watcher/_types/Conditions.ts
+++ b/specification/watcher/_types/Conditions.ts
@@ -30,7 +30,7 @@ export class ArrayCompareOpParams {
 }
 
 /**
- * @behavior_meta AdditionalProperty name=operator value=params
+ * @behavior_meta AdditionalProperty key=operator value=params
  */
 export class ArrayCompareCondition
   implements AdditionalProperty<ConditionOp, ArrayCompareOpParams>