diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorIndexOptions.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorIndexOptions.java
index 08b539636..c655332e0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorIndexOptions.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorIndexOptions.java
@@ -32,6 +32,7 @@
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Float;
 import java.lang.Integer;
+import java.lang.String;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Nullable;
@@ -61,25 +62,25 @@
  */
 @JsonpDeserializable
 public class DenseVectorIndexOptions implements JsonpSerializable {
+	private final String type;
+
 	@Nullable
-	private final Float confidenceInterval;
+	private final Integer m;
 
 	@Nullable
 	private final Integer efConstruction;
 
 	@Nullable
-	private final Integer m;
-
-	private final DenseVectorIndexOptionsType type;
+	private final Float confidenceInterval;
 
 	// ---------------------------------------------------------------------------------------------
 
 	private DenseVectorIndexOptions(Builder builder) {
 
-		this.confidenceInterval = builder.confidenceInterval;
-		this.efConstruction = builder.efConstruction;
-		this.m = builder.m;
 		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
+		this.m = builder.m;
+		this.efConstruction = builder.efConstruction;
+		this.confidenceInterval = builder.confidenceInterval;
 
 	}
 
@@ -88,64 +89,34 @@ public static DenseVectorIndexOptions of(Function<Builder, ObjectBuilder<DenseVe
 	}
 
 	/**
-	 * The confidence interval to use when quantizing the vectors. Can be any value
-	 * between and including <code>0.90</code> and <code>1.0</code> or exactly
-	 * <code>0</code>. When the value is <code>0</code>, this indicates that dynamic
-	 * quantiles should be calculated for optimized quantization. When between
-	 * <code>0.90</code> and <code>1.0</code>, this value restricts the values used
-	 * when calculating the quantization thresholds.
-	 * <p>
-	 * For example, a value of <code>0.95</code> will only use the middle
-	 * <code>95%</code> of the values when calculating the quantization thresholds
-	 * (e.g. the highest and lowest <code>2.5%</code> of values will be ignored).
-	 * <p>
-	 * Defaults to <code>1/(dims + 1)</code> for <code>int8</code> quantized vectors
-	 * and <code>0</code> for <code>int4</code> for dynamic quantile calculation.
-	 * <p>
-	 * Only applicable to <code>int8_hnsw</code>, <code>int4_hnsw</code>,
-	 * <code>int8_flat</code>, and <code>int4_flat</code> index types.
-	 * <p>
-	 * API name: {@code confidence_interval}
+	 * Required - API name: {@code type}
 	 */
-	@Nullable
-	public final Float confidenceInterval() {
-		return this.confidenceInterval;
+	public final String type() {
+		return this.type;
 	}
 
 	/**
-	 * The number of candidates to track while assembling the list of nearest
-	 * neighbors for each new node.
-	 * <p>
-	 * Only applicable to <code>hnsw</code>, <code>int8_hnsw</code>, and
-	 * <code>int4_hnsw</code> index types.
-	 * <p>
-	 * API name: {@code ef_construction}
+	 * API name: {@code m}
 	 */
 	@Nullable
-	public final Integer efConstruction() {
-		return this.efConstruction;
+	public final Integer m() {
+		return this.m;
 	}
 
 	/**
-	 * The number of neighbors each node will be connected to in the HNSW graph.
-	 * <p>
-	 * Only applicable to <code>hnsw</code>, <code>int8_hnsw</code>, and
-	 * <code>int4_hnsw</code> index types.
-	 * <p>
-	 * API name: {@code m}
+	 * API name: {@code ef_construction}
 	 */
 	@Nullable
-	public final Integer m() {
-		return this.m;
+	public final Integer efConstruction() {
+		return this.efConstruction;
 	}
 
 	/**
-	 * Required - The type of kNN algorithm to use.
-	 * <p>
-	 * API name: {@code type}
+	 * API name: {@code confidence_interval}
 	 */
-	public final DenseVectorIndexOptionsType type() {
-		return this.type;
+	@Nullable
+	public final Float confidenceInterval() {
+		return this.confidenceInterval;
 	}
 
 	/**
@@ -159,9 +130,12 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.confidenceInterval != null) {
-			generator.writeKey("confidence_interval");
-			generator.write(this.confidenceInterval);
+		generator.writeKey("type");
+		generator.write(this.type);
+
+		if (this.m != null) {
+			generator.writeKey("m");
+			generator.write(this.m);
 
 		}
 		if (this.efConstruction != null) {
@@ -169,13 +143,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			generator.write(this.efConstruction);
 
 		}
-		if (this.m != null) {
-			generator.writeKey("m");
-			generator.write(this.m);
+		if (this.confidenceInterval != null) {
+			generator.writeKey("confidence_interval");
+			generator.write(this.confidenceInterval);
 
 		}
-		generator.writeKey("type");
-		this.type.serialize(generator, mapper);
 
 	}
 
@@ -193,76 +165,46 @@ public String toString() {
 	public static class Builder extends WithJsonObjectBuilderBase<Builder>
 			implements
 				ObjectBuilder<DenseVectorIndexOptions> {
+		private String type;
+
 		@Nullable
-		private Float confidenceInterval;
+		private Integer m;
 
 		@Nullable
 		private Integer efConstruction;
 
 		@Nullable
-		private Integer m;
-
-		private DenseVectorIndexOptionsType type;
+		private Float confidenceInterval;
 
 		/**
-		 * The confidence interval to use when quantizing the vectors. Can be any value
-		 * between and including <code>0.90</code> and <code>1.0</code> or exactly
-		 * <code>0</code>. When the value is <code>0</code>, this indicates that dynamic
-		 * quantiles should be calculated for optimized quantization. When between
-		 * <code>0.90</code> and <code>1.0</code>, this value restricts the values used
-		 * when calculating the quantization thresholds.
-		 * <p>
-		 * For example, a value of <code>0.95</code> will only use the middle
-		 * <code>95%</code> of the values when calculating the quantization thresholds
-		 * (e.g. the highest and lowest <code>2.5%</code> of values will be ignored).
-		 * <p>
-		 * Defaults to <code>1/(dims + 1)</code> for <code>int8</code> quantized vectors
-		 * and <code>0</code> for <code>int4</code> for dynamic quantile calculation.
-		 * <p>
-		 * Only applicable to <code>int8_hnsw</code>, <code>int4_hnsw</code>,
-		 * <code>int8_flat</code>, and <code>int4_flat</code> index types.
-		 * <p>
-		 * API name: {@code confidence_interval}
+		 * Required - API name: {@code type}
 		 */
-		public final Builder confidenceInterval(@Nullable Float value) {
-			this.confidenceInterval = value;
+		public final Builder type(String value) {
+			this.type = value;
 			return this;
 		}
 
 		/**
-		 * The number of candidates to track while assembling the list of nearest
-		 * neighbors for each new node.
-		 * <p>
-		 * Only applicable to <code>hnsw</code>, <code>int8_hnsw</code>, and
-		 * <code>int4_hnsw</code> index types.
-		 * <p>
-		 * API name: {@code ef_construction}
+		 * API name: {@code m}
 		 */
-		public final Builder efConstruction(@Nullable Integer value) {
-			this.efConstruction = value;
+		public final Builder m(@Nullable Integer value) {
+			this.m = value;
 			return this;
 		}
 
 		/**
-		 * The number of neighbors each node will be connected to in the HNSW graph.
-		 * <p>
-		 * Only applicable to <code>hnsw</code>, <code>int8_hnsw</code>, and
-		 * <code>int4_hnsw</code> index types.
-		 * <p>
-		 * API name: {@code m}
+		 * API name: {@code ef_construction}
 		 */
-		public final Builder m(@Nullable Integer value) {
-			this.m = value;
+		public final Builder efConstruction(@Nullable Integer value) {
+			this.efConstruction = value;
 			return this;
 		}
 
 		/**
-		 * Required - The type of kNN algorithm to use.
-		 * <p>
-		 * API name: {@code type}
+		 * API name: {@code confidence_interval}
 		 */
-		public final Builder type(DenseVectorIndexOptionsType value) {
-			this.type = value;
+		public final Builder confidenceInterval(@Nullable Float value) {
+			this.confidenceInterval = value;
 			return this;
 		}
 
@@ -295,10 +237,10 @@ public DenseVectorIndexOptions build() {
 	protected static void setupDenseVectorIndexOptionsDeserializer(
 			ObjectDeserializer<DenseVectorIndexOptions.Builder> op) {
 
-		op.add(Builder::confidenceInterval, JsonpDeserializer.floatDeserializer(), "confidence_interval");
-		op.add(Builder::efConstruction, JsonpDeserializer.integerDeserializer(), "ef_construction");
+		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
 		op.add(Builder::m, JsonpDeserializer.integerDeserializer(), "m");
-		op.add(Builder::type, DenseVectorIndexOptionsType._DESERIALIZER, "type");
+		op.add(Builder::efConstruction, JsonpDeserializer.integerDeserializer(), "ef_construction");
+		op.add(Builder::confidenceInterval, JsonpDeserializer.floatDeserializer(), "confidence_interval");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorIndexOptionsType.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorIndexOptionsType.java
deleted file mode 100644
index 5d0cd38f3..000000000
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorIndexOptionsType.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package co.elastic.clients.elasticsearch._types.mapping;
-
-import co.elastic.clients.json.JsonEnum;
-import co.elastic.clients.json.JsonpDeserializable;
-import co.elastic.clients.json.JsonpDeserializer;
-
-//----------------------------------------------------------------
-//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
-//----------------------------------------------------------------
-//
-// This code is generated from the Elasticsearch API specification
-// at https://github.com/elastic/elasticsearch-specification
-//
-// Manual updates to this file will be lost when the code is
-// re-generated.
-//
-// If you find a property that is missing or wrongly typed, please
-// open an issue or a PR on the API specification repository.
-//
-//----------------------------------------------------------------
-
-/**
- *
- * @see <a href=
- *      "../../doc-files/api-spec.html#_types.mapping.DenseVectorIndexOptionsType">API
- *      specification</a>
- */
-@JsonpDeserializable
-public enum DenseVectorIndexOptionsType implements JsonEnum {
-	/**
-	 * This utilizes a brute-force search algorithm for exact kNN search. This
-	 * supports all <code>element_type</code> values.
-	 */
-	Flat("flat"),
-
-	/**
-	 * This utilizes the HNSW algorithm for scalable approximate kNN search. This
-	 * supports all <code>element_type</code> values.
-	 */
-	Hnsw("hnsw"),
-
-	/**
-	 * This utilizes a brute-force search algorithm in addition to automatically
-	 * half-byte scalar quantization. Only supports <code>element_type</code> of
-	 * <code>float</code>.
-	 */
-	Int4Flat("int4_flat"),
-
-	/**
-	 * This utilizes the HNSW algorithm in addition to automatically scalar
-	 * quantization for scalable approximate kNN search with
-	 * <code>element_type</code> of <code>float</code>.
-	 * <p>
-	 * This can reduce the memory footprint by 8x at the cost of some accuracy.
-	 */
-	Int4Hnsw("int4_hnsw"),
-
-	/**
-	 * This utilizes a brute-force search algorithm in addition to automatically
-	 * scalar quantization. Only supports <code>element_type</code> of
-	 * <code>float</code>.
-	 */
-	Int8Flat("int8_flat"),
-
-	/**
-	 * The default index type for <code>float</code> vectors. This utilizes the HNSW
-	 * algorithm in addition to automatically scalar quantization for scalable
-	 * approximate kNN search with <code>element_type</code> of <code>float</code>.
-	 * <p>
-	 * This can reduce the memory footprint by 4x at the cost of some accuracy.
-	 */
-	Int8Hnsw("int8_hnsw"),
-
-	;
-
-	private final String jsonValue;
-
-	DenseVectorIndexOptionsType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
-
-	public String jsonValue() {
-		return this.jsonValue;
-	}
-
-	public static final JsonEnum.Deserializer<DenseVectorIndexOptionsType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			DenseVectorIndexOptionsType.values());
-}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorProperty.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorProperty.java
index 0fa3c2d3b..200d4fc98 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorProperty.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorProperty.java
@@ -28,6 +28,7 @@
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Boolean;
 import java.lang.Integer;
+import java.lang.String;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Nullable;
@@ -57,11 +58,14 @@
  */
 @JsonpDeserializable
 public class DenseVectorProperty extends PropertyBase implements PropertyVariant {
+	@Nullable
+	private final String elementType;
+
 	@Nullable
 	private final Integer dims;
 
 	@Nullable
-	private final DenseVectorElementType elementType;
+	private final String similarity;
 
 	@Nullable
 	private final Boolean index;
@@ -69,19 +73,16 @@ public class DenseVectorProperty extends PropertyBase implements PropertyVariant
 	@Nullable
 	private final DenseVectorIndexOptions indexOptions;
 
-	@Nullable
-	private final DenseVectorSimilarity similarity;
-
 	// ---------------------------------------------------------------------------------------------
 
 	private DenseVectorProperty(Builder builder) {
 		super(builder);
 
-		this.dims = builder.dims;
 		this.elementType = builder.elementType;
+		this.dims = builder.dims;
+		this.similarity = builder.similarity;
 		this.index = builder.index;
 		this.indexOptions = builder.indexOptions;
-		this.similarity = builder.similarity;
 
 	}
 
@@ -98,10 +99,14 @@ public Property.Kind _propertyKind() {
 	}
 
 	/**
-	 * Number of vector dimensions. Can't exceed <code>4096</code>. If
-	 * <code>dims</code> is not specified, it will be set to the length of the first
-	 * vector added to the field.
-	 * <p>
+	 * API name: {@code element_type}
+	 */
+	@Nullable
+	public final String elementType() {
+		return this.elementType;
+	}
+
+	/**
 	 * API name: {@code dims}
 	 */
 	@Nullable
@@ -110,19 +115,14 @@ public final Integer dims() {
 	}
 
 	/**
-	 * The data type used to encode vectors. The supported data types are
-	 * <code>float</code> (default), <code>byte</code>, and <code>bit</code>.
-	 * <p>
-	 * API name: {@code element_type}
+	 * API name: {@code similarity}
 	 */
 	@Nullable
-	public final DenseVectorElementType elementType() {
-		return this.elementType;
+	public final String similarity() {
+		return this.similarity;
 	}
 
 	/**
-	 * If <code>true</code>, you can search this field using the kNN search API.
-	 * <p>
 	 * API name: {@code index}
 	 */
 	@Nullable
@@ -131,14 +131,6 @@ public final Boolean index() {
 	}
 
 	/**
-	 * An optional section that configures the kNN indexing algorithm. The HNSW
-	 * algorithm has two internal parameters that influence how the data structure
-	 * is built. These can be adjusted to improve the accuracy of results, at the
-	 * expense of slower indexing speed.
-	 * <p>
-	 * This parameter can only be specified when <code>index</code> is
-	 * <code>true</code>.
-	 * <p>
 	 * API name: {@code index_options}
 	 */
 	@Nullable
@@ -146,42 +138,24 @@ public final DenseVectorIndexOptions indexOptions() {
 		return this.indexOptions;
 	}
 
-	/**
-	 * The vector similarity metric to use in kNN search.
-	 * <p>
-	 * Documents are ranked by their vector field's similarity to the query vector.
-	 * The <code>_score</code> of each document will be derived from the similarity,
-	 * in a way that ensures scores are positive and that a larger score corresponds
-	 * to a higher ranking.
-	 * <p>
-	 * Defaults to <code>l2_norm</code> when <code>element_type</code> is
-	 * <code>bit</code> otherwise defaults to <code>cosine</code>.
-	 * <p>
-	 * <code>bit</code> vectors only support <code>l2_norm</code> as their
-	 * similarity metric.
-	 * <p>
-	 * This parameter can only be specified when <code>index</code> is
-	 * <code>true</code>.
-	 * <p>
-	 * API name: {@code similarity}
-	 */
-	@Nullable
-	public final DenseVectorSimilarity similarity() {
-		return this.similarity;
-	}
-
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		generator.write("type", "dense_vector");
 		super.serializeInternal(generator, mapper);
+		if (this.elementType != null) {
+			generator.writeKey("element_type");
+			generator.write(this.elementType);
+
+		}
 		if (this.dims != null) {
 			generator.writeKey("dims");
 			generator.write(this.dims);
 
 		}
-		if (this.elementType != null) {
-			generator.writeKey("element_type");
-			this.elementType.serialize(generator, mapper);
+		if (this.similarity != null) {
+			generator.writeKey("similarity");
+			generator.write(this.similarity);
+
 		}
 		if (this.index != null) {
 			generator.writeKey("index");
@@ -193,10 +167,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			this.indexOptions.serialize(generator, mapper);
 
 		}
-		if (this.similarity != null) {
-			generator.writeKey("similarity");
-			this.similarity.serialize(generator, mapper);
-		}
 
 	}
 
@@ -209,11 +179,14 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 	public static class Builder extends PropertyBase.AbstractBuilder<Builder>
 			implements
 				ObjectBuilder<DenseVectorProperty> {
+		@Nullable
+		private String elementType;
+
 		@Nullable
 		private Integer dims;
 
 		@Nullable
-		private DenseVectorElementType elementType;
+		private String similarity;
 
 		@Nullable
 		private Boolean index;
@@ -221,14 +194,15 @@ public static class Builder extends PropertyBase.AbstractBuilder<Builder>
 		@Nullable
 		private DenseVectorIndexOptions indexOptions;
 
-		@Nullable
-		private DenseVectorSimilarity similarity;
+		/**
+		 * API name: {@code element_type}
+		 */
+		public final Builder elementType(@Nullable String value) {
+			this.elementType = value;
+			return this;
+		}
 
 		/**
-		 * Number of vector dimensions. Can't exceed <code>4096</code>. If
-		 * <code>dims</code> is not specified, it will be set to the length of the first
-		 * vector added to the field.
-		 * <p>
 		 * API name: {@code dims}
 		 */
 		public final Builder dims(@Nullable Integer value) {
@@ -237,19 +211,14 @@ public final Builder dims(@Nullable Integer value) {
 		}
 
 		/**
-		 * The data type used to encode vectors. The supported data types are
-		 * <code>float</code> (default), <code>byte</code>, and <code>bit</code>.
-		 * <p>
-		 * API name: {@code element_type}
+		 * API name: {@code similarity}
 		 */
-		public final Builder elementType(@Nullable DenseVectorElementType value) {
-			this.elementType = value;
+		public final Builder similarity(@Nullable String value) {
+			this.similarity = value;
 			return this;
 		}
 
 		/**
-		 * If <code>true</code>, you can search this field using the kNN search API.
-		 * <p>
 		 * API name: {@code index}
 		 */
 		public final Builder index(@Nullable Boolean value) {
@@ -258,14 +227,6 @@ public final Builder index(@Nullable Boolean value) {
 		}
 
 		/**
-		 * An optional section that configures the kNN indexing algorithm. The HNSW
-		 * algorithm has two internal parameters that influence how the data structure
-		 * is built. These can be adjusted to improve the accuracy of results, at the
-		 * expense of slower indexing speed.
-		 * <p>
-		 * This parameter can only be specified when <code>index</code> is
-		 * <code>true</code>.
-		 * <p>
 		 * API name: {@code index_options}
 		 */
 		public final Builder indexOptions(@Nullable DenseVectorIndexOptions value) {
@@ -274,14 +235,6 @@ public final Builder indexOptions(@Nullable DenseVectorIndexOptions value) {
 		}
 
 		/**
-		 * An optional section that configures the kNN indexing algorithm. The HNSW
-		 * algorithm has two internal parameters that influence how the data structure
-		 * is built. These can be adjusted to improve the accuracy of results, at the
-		 * expense of slower indexing speed.
-		 * <p>
-		 * This parameter can only be specified when <code>index</code> is
-		 * <code>true</code>.
-		 * <p>
 		 * API name: {@code index_options}
 		 */
 		public final Builder indexOptions(
@@ -289,30 +242,6 @@ public final Builder indexOptions(
 			return this.indexOptions(fn.apply(new DenseVectorIndexOptions.Builder()).build());
 		}
 
-		/**
-		 * The vector similarity metric to use in kNN search.
-		 * <p>
-		 * Documents are ranked by their vector field's similarity to the query vector.
-		 * The <code>_score</code> of each document will be derived from the similarity,
-		 * in a way that ensures scores are positive and that a larger score corresponds
-		 * to a higher ranking.
-		 * <p>
-		 * Defaults to <code>l2_norm</code> when <code>element_type</code> is
-		 * <code>bit</code> otherwise defaults to <code>cosine</code>.
-		 * <p>
-		 * <code>bit</code> vectors only support <code>l2_norm</code> as their
-		 * similarity metric.
-		 * <p>
-		 * This parameter can only be specified when <code>index</code> is
-		 * <code>true</code>.
-		 * <p>
-		 * API name: {@code similarity}
-		 */
-		public final Builder similarity(@Nullable DenseVectorSimilarity value) {
-			this.similarity = value;
-			return this;
-		}
-
 		@Override
 		protected Builder self() {
 			return this;
@@ -341,11 +270,11 @@ public DenseVectorProperty build() {
 
 	protected static void setupDenseVectorPropertyDeserializer(ObjectDeserializer<DenseVectorProperty.Builder> op) {
 		PropertyBase.setupPropertyBaseDeserializer(op);
+		op.add(Builder::elementType, JsonpDeserializer.stringDeserializer(), "element_type");
 		op.add(Builder::dims, JsonpDeserializer.integerDeserializer(), "dims");
-		op.add(Builder::elementType, DenseVectorElementType._DESERIALIZER, "element_type");
+		op.add(Builder::similarity, JsonpDeserializer.stringDeserializer(), "similarity");
 		op.add(Builder::index, JsonpDeserializer.booleanDeserializer(), "index");
 		op.add(Builder::indexOptions, DenseVectorIndexOptions._DESERIALIZER, "index_options");
-		op.add(Builder::similarity, DenseVectorSimilarity._DESERIALIZER, "similarity");
 
 		op.ignore("type");
 	}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorSimilarity.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorSimilarity.java
deleted file mode 100644
index e1d7f162d..000000000
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorSimilarity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package co.elastic.clients.elasticsearch._types.mapping;
-
-import co.elastic.clients.json.JsonEnum;
-import co.elastic.clients.json.JsonpDeserializable;
-import co.elastic.clients.json.JsonpDeserializer;
-
-//----------------------------------------------------------------
-//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
-//----------------------------------------------------------------
-//
-// This code is generated from the Elasticsearch API specification
-// at https://github.com/elastic/elasticsearch-specification
-//
-// Manual updates to this file will be lost when the code is
-// re-generated.
-//
-// If you find a property that is missing or wrongly typed, please
-// open an issue or a PR on the API specification repository.
-//
-//----------------------------------------------------------------
-
-/**
- *
- * @see <a href=
- *      "../../doc-files/api-spec.html#_types.mapping.DenseVectorSimilarity">API
- *      specification</a>
- */
-@JsonpDeserializable
-public enum DenseVectorSimilarity implements JsonEnum {
-	/**
-	 * Computes the cosine similarity. During indexing Elasticsearch automatically
-	 * normalizes vectors with <code>cosine</code> similarity to unit length. This
-	 * allows to internally use <code>dot_product</code> for computing similarity,
-	 * which is more efficient. Original un-normalized vectors can be still accessed
-	 * through scripts.
-	 * <p>
-	 * The document <code>_score</code> is computed as
-	 * <code>(1 + cosine(query, vector)) / 2</code>.
-	 * <p>
-	 * The <code>cosine</code> similarity does not allow vectors with zero
-	 * magnitude, since cosine is not defined in this case.
-	 */
-	Cosine("cosine"),
-
-	/**
-	 * Computes the dot product of two unit vectors. This option provides an
-	 * optimized way to perform cosine similarity. The constraints and computed
-	 * score are defined by <code>element_type</code>.
-	 * <p>
-	 * When <code>element_type</code> is <code>float</code>, all vectors must be
-	 * unit length, including both document and query vectors.
-	 * <p>
-	 * The document <code>_score</code> is computed as
-	 * <code>(1 + dot_product(query, vector)) / 2</code>.
-	 * <p>
-	 * When <code>element_type</code> is <code>byte</code>, all vectors must have
-	 * the same length including both document and query vectors or results will be
-	 * inaccurate.
-	 * <p>
-	 * The document <code>_score</code> is computed as
-	 * <code>0.5 + (dot_product(query, vector) / (32768 * dims))</code> where
-	 * <code>dims</code> is the number of dimensions per vector.
-	 */
-	DotProduct("dot_product"),
-
-	/**
-	 * Computes similarity based on the <code>L2</code> distance (also known as
-	 * Euclidean distance) between the vectors.
-	 * <p>
-	 * The document <code>_score</code> is computed as
-	 * <code>1 / (1 + l2_norm(query, vector)^2)</code>.
-	 * <p>
-	 * For <code>bit</code> vectors, instead of using <code>l2_norm</code>, the
-	 * <code>hamming</code> distance between the vectors is used.
-	 * <p>
-	 * The <code>_score</code> transformation is
-	 * <code>(numBits - hamming(a, b)) / numBits</code>.
-	 */
-	L2Norm("l2_norm"),
-
-	/**
-	 * Computes the maximum inner product of two vectors. This is similar to
-	 * <code>dot_product</code>, but doesn't require vectors to be normalized. This
-	 * means that each vector’s magnitude can significantly effect the score.
-	 * <p>
-	 * The document <code>_score</code> is adjusted to prevent negative values. For
-	 * <code>max_inner_product</code> values <code>&lt; 0</code>, the
-	 * <code>_score</code> is
-	 * <code>1 / (1 + -1 * max_inner_product(query, vector))</code>. For
-	 * non-negative <code>max_inner_product</code> results the <code>_score</code>
-	 * is calculated <code>max_inner_product(query, vector) + 1</code>.
-	 */
-	MaxInnerProduct("max_inner_product"),
-
-	;
-
-	private final String jsonValue;
-
-	DenseVectorSimilarity(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
-
-	public String jsonValue() {
-		return this.jsonValue;
-	}
-
-	public static final JsonEnum.Deserializer<DenseVectorSimilarity> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			DenseVectorSimilarity.values());
-}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/TermsSetQuery.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/TermsSetQuery.java
index e541a91f6..29ac04f6d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/TermsSetQuery.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/TermsSetQuery.java
@@ -19,7 +19,6 @@
 
 package co.elastic.clients.elasticsearch._types.query_dsl;
 
-import co.elastic.clients.elasticsearch._types.FieldValue;
 import co.elastic.clients.elasticsearch._types.Script;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
@@ -30,7 +29,6 @@
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 import java.lang.String;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
@@ -73,7 +71,7 @@ public class TermsSetQuery extends QueryBase implements QueryVariant {
 	@Nullable
 	private final Script minimumShouldMatchScript;
 
-	private final List<FieldValue> terms;
+	private final List<String> terms;
 
 	// ---------------------------------------------------------------------------------------------
 
@@ -145,7 +143,7 @@ public final Script minimumShouldMatchScript() {
 	 * <p>
 	 * API name: {@code terms}
 	 */
-	public final List<FieldValue> terms() {
+	public final List<String> terms() {
 		return this.terms;
 	}
 
@@ -171,8 +169,8 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 		if (ApiTypeHelper.isDefined(this.terms)) {
 			generator.writeKey("terms");
 			generator.writeStartArray();
-			for (FieldValue item0 : this.terms) {
-				item0.serialize(generator, mapper);
+			for (String item0 : this.terms) {
+				generator.write(item0);
 
 			}
 			generator.writeEnd();
@@ -209,7 +207,7 @@ public final Builder field(String value) {
 		@Nullable
 		private Script minimumShouldMatchScript;
 
-		private List<FieldValue> terms;
+		private List<String> terms;
 
 		/**
 		 * Specification describing number of matching terms required to return a
@@ -261,7 +259,7 @@ public final Builder minimumShouldMatchScript(Function<Script.Builder, ObjectBui
 		 * <p>
 		 * Adds all elements of <code>list</code> to <code>terms</code>.
 		 */
-		public final Builder terms(List<FieldValue> list) {
+		public final Builder terms(List<String> list) {
 			this.terms = _listAddAll(this.terms, list);
 			return this;
 		}
@@ -273,90 +271,11 @@ public final Builder terms(List<FieldValue> list) {
 		 * <p>
 		 * Adds one or more values to <code>terms</code>.
 		 */
-		public final Builder terms(FieldValue value, FieldValue... values) {
-			this.terms = _listAdd(this.terms, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Array of terms you wish to find in the provided field.
-		 * <p>
-		 * API name: {@code terms}
-		 * <p>
-		 * Adds all passed values to <code>terms</code>.
-		 */
 		public final Builder terms(String value, String... values) {
-			this.terms = _listAdd(this.terms, FieldValue.of(value));
-			List<FieldValue> fieldValues = new ArrayList<>();
-			for (String v : values) {
-				fieldValues.add(FieldValue.of(v));
-			}
-			this.terms = _listAddAll(this.terms, fieldValues);
-			return this;
-		}
-
-		/**
-		 * Required - Array of terms you wish to find in the provided field.
-		 * <p>
-		 * API name: {@code terms}
-		 * <p>
-		 * Adds all passed values to <code>terms</code>.
-		 */
-		public final Builder terms(long value, long... values) {
-			this.terms = _listAdd(this.terms, FieldValue.of(value));
-			List<FieldValue> fieldValues = new ArrayList<>();
-			for (long v : values) {
-				fieldValues.add(FieldValue.of(v));
-			}
-			this.terms = _listAddAll(this.terms, fieldValues);
-			return this;
-		}
-
-		/**
-		 * Required - Array of terms you wish to find in the provided field.
-		 * <p>
-		 * API name: {@code terms}
-		 * <p>
-		 * Adds all passed values to <code>terms</code>.
-		 */
-		public final Builder terms(double value, double... values) {
-			this.terms = _listAdd(this.terms, FieldValue.of(value));
-			List<FieldValue> fieldValues = new ArrayList<>();
-			for (double v : values) {
-				fieldValues.add(FieldValue.of(v));
-			}
-			this.terms = _listAddAll(this.terms, fieldValues);
-			return this;
-		}
-
-		/**
-		 * Required - Array of terms you wish to find in the provided field.
-		 * <p>
-		 * API name: {@code terms}
-		 * <p>
-		 * Adds all passed values to <code>terms</code>.
-		 */
-		public final Builder terms(boolean value, boolean... values) {
-			this.terms = _listAdd(this.terms, FieldValue.of(value));
-			List<FieldValue> fieldValues = new ArrayList<>();
-			for (boolean v : values) {
-				fieldValues.add(FieldValue.of(v));
-			}
-			this.terms = _listAddAll(this.terms, fieldValues);
+			this.terms = _listAdd(this.terms, value, values);
 			return this;
 		}
 
-		/**
-		 * Required - Array of terms you wish to find in the provided field.
-		 * <p>
-		 * API name: {@code terms}
-		 * <p>
-		 * Adds a value to <code>terms</code> using a builder lambda.
-		 */
-		public final Builder terms(Function<FieldValue.Builder, ObjectBuilder<FieldValue>> fn) {
-			return terms(fn.apply(new FieldValue.Builder()).build());
-		}
-
 		@Override
 		protected Builder self() {
 			return this;
@@ -388,7 +307,7 @@ protected static void setupTermsSetQueryDeserializer(ObjectDeserializer<TermsSet
 		op.add(Builder::minimumShouldMatch, JsonpDeserializer.stringDeserializer(), "minimum_should_match");
 		op.add(Builder::minimumShouldMatchField, JsonpDeserializer.stringDeserializer(), "minimum_should_match_field");
 		op.add(Builder::minimumShouldMatchScript, Script._DESERIALIZER, "minimum_should_match_script");
-		op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(FieldValue._DESERIALIZER), "terms");
+		op.add(Builder::terms, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()), "terms");
 
 		op.setKey(Builder::field, JsonpDeserializer.stringDeserializer());
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java
index d38c35ab7..f6d697999 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/async_search/SubmitRequest.java
@@ -175,6 +175,9 @@ public class SubmitRequest extends RequestBase implements JsonpSerializable {
 	@Nullable
 	private final Long maxConcurrentShardRequests;
 
+	@Nullable
+	private final String minCompatibleShardNode;
+
 	@Nullable
 	private final Double minScore;
 
@@ -279,6 +282,7 @@ private SubmitRequest(Builder builder) {
 		this.knn = ApiTypeHelper.unmodifiable(builder.knn);
 		this.lenient = builder.lenient;
 		this.maxConcurrentShardRequests = builder.maxConcurrentShardRequests;
+		this.minCompatibleShardNode = builder.minCompatibleShardNode;
 		this.minScore = builder.minScore;
 		this.pit = builder.pit;
 		this.postFilter = builder.postFilter;
@@ -581,6 +585,14 @@ public final Long maxConcurrentShardRequests() {
 		return this.maxConcurrentShardRequests;
 	}
 
+	/**
+	 * API name: {@code min_compatible_shard_node}
+	 */
+	@Nullable
+	public final String minCompatibleShardNode() {
+		return this.minCompatibleShardNode;
+	}
+
 	/**
 	 * Minimum _score for matching documents. Documents with a lower _score are not
 	 * included in the search results.
@@ -1196,6 +1208,9 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
 		@Nullable
 		private Long maxConcurrentShardRequests;
 
+		@Nullable
+		private String minCompatibleShardNode;
+
 		@Nullable
 		private Double minScore;
 
@@ -1735,6 +1750,14 @@ public final Builder maxConcurrentShardRequests(@Nullable Long value) {
 			return this;
 		}
 
+		/**
+		 * API name: {@code min_compatible_shard_node}
+		 */
+		public final Builder minCompatibleShardNode(@Nullable String value) {
+			this.minCompatibleShardNode = value;
+			return this;
+		}
+
 		/**
 		 * Minimum _score for matching documents. Documents with a lower _score are not
 		 * included in the search results.
@@ -2421,6 +2444,9 @@ protected static void setupSubmitRequestDeserializer(ObjectDeserializer<SubmitRe
 				if (request.df != null) {
 					params.put("df", request.df);
 				}
+				if (request.minCompatibleShardNode != null) {
+					params.put("min_compatible_shard_node", request.minCompatibleShardNode);
+				}
 				if (request.lenient != null) {
 					params.put("lenient", String.valueOf(request.lenient));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java
index 22562342d..a1cea8c6c 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AliasesRequest.java
@@ -21,6 +21,7 @@
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
 import co.elastic.clients.elasticsearch._types.ExpandWildcard;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -30,6 +31,7 @@
 import co.elastic.clients.util.ApiTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
+import java.lang.Boolean;
 import java.lang.String;
 import java.util.HashMap;
 import java.util.List;
@@ -71,6 +73,12 @@
 public class AliasesRequest extends CatRequestBase {
 	private final List<ExpandWildcard> expandWildcards;
 
+	@Nullable
+	private final Boolean local;
+
+	@Nullable
+	private final Time masterTimeout;
+
 	private final List<String> name;
 
 	// ---------------------------------------------------------------------------------------------
@@ -78,6 +86,8 @@ public class AliasesRequest extends CatRequestBase {
 	private AliasesRequest(Builder builder) {
 
 		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
+		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 		this.name = ApiTypeHelper.unmodifiable(builder.name);
 
 	}
@@ -96,6 +106,30 @@ public final List<ExpandWildcard> expandWildcards() {
 		return this.expandWildcards;
 	}
 
+	/**
+	 * If <code>true</code>, the request computes the list of selected nodes from
+	 * the local cluster state. If <code>false</code> the list of selected nodes are
+	 * computed from the cluster state of the master node. In both cases the
+	 * coordinating node will send requests for further information to each selected
+	 * node.
+	 * <p>
+	 * API name: {@code local}
+	 */
+	@Nullable
+	public final Boolean local() {
+		return this.local;
+	}
+
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	/**
 	 * A comma-separated list of aliases to retrieve. Supports wildcards
 	 * (<code>*</code>). To retrieve all aliases, omit this parameter or use
@@ -119,6 +153,12 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private List<ExpandWildcard> expandWildcards;
 
+		@Nullable
+		private Boolean local;
+
+		@Nullable
+		private Time masterTimeout;
+
 		@Nullable
 		private List<String> name;
 
@@ -148,6 +188,39 @@ public final Builder expandWildcards(ExpandWildcard value, ExpandWildcard... val
 			return this;
 		}
 
+		/**
+		 * If <code>true</code>, the request computes the list of selected nodes from
+		 * the local cluster state. If <code>false</code> the list of selected nodes are
+		 * computed from the cluster state of the master node. In both cases the
+		 * coordinating node will send requests for further information to each selected
+		 * node.
+		 * <p>
+		 * API name: {@code local}
+		 */
+		public final Builder local(@Nullable Boolean value) {
+			this.local = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		/**
 		 * A comma-separated list of aliases to retrieve. Supports wildcards
 		 * (<code>*</code>). To retrieve all aliases, omit this parameter or use
@@ -257,10 +330,16 @@ public AliasesRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
 					params.put("expand_wildcards",
 							request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
 				}
+				if (request.local != null) {
+					params.put("local", String.valueOf(request.local));
+				}
 				return params;
 
 			}, SimpleEndpoint.emptyMap(), false, AliasesResponse._DESERIALIZER);
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java
index 208adcedb..ba154296b 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/AllocationRequest.java
@@ -21,6 +21,7 @@
 
 import co.elastic.clients.elasticsearch._types.Bytes;
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -58,10 +59,10 @@
 // typedef: cat.allocation.Request
 
 /**
- * Get shard allocation information. Get a snapshot of the number of shards
- * allocated to each data node and their disk space. IMPORTANT: cat APIs are
- * only intended for human consumption using the command line or Kibana console.
- * They are not intended for use by applications.
+ * Provides a snapshot of the number of shards allocated to each data node and
+ * their disk space. IMPORTANT: cat APIs are only intended for human consumption
+ * using the command line or Kibana console. They are not intended for use by
+ * applications.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.allocation.Request">API
  *      specification</a>
@@ -74,6 +75,9 @@ public class AllocationRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	private final List<String> nodeId;
 
 	// ---------------------------------------------------------------------------------------------
@@ -82,6 +86,7 @@ private AllocationRequest(Builder builder) {
 
 		this.bytes = builder.bytes;
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
 
 	}
@@ -114,6 +119,16 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	/**
 	 * Comma-separated list of node identifiers or names used to limit the returned
 	 * information.
@@ -139,6 +154,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
 		@Nullable
 		private List<String> nodeId;
 
@@ -166,6 +184,25 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		/**
 		 * Comma-separated list of node identifiers or names used to limit the returned
 		 * information.
@@ -274,6 +311,9 @@ public AllocationRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.bytes != null) {
 					params.put("bytes", request.bytes.jsonValue());
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java
index ef0891a3a..556e3a40b 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ComponentTemplatesRequest.java
@@ -20,6 +20,7 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -70,6 +71,9 @@ public class ComponentTemplatesRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	@Nullable
 	private final String name;
 
@@ -78,6 +82,7 @@ public class ComponentTemplatesRequest extends CatRequestBase {
 	private ComponentTemplatesRequest(Builder builder) {
 
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 		this.name = builder.name;
 
 	}
@@ -100,6 +105,16 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	/**
 	 * The name of the component template. Accepts wildcard expressions. If omitted,
 	 * all component templates are returned.
@@ -123,6 +138,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
 		@Nullable
 		private String name;
 
@@ -140,6 +158,25 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		/**
 		 * The name of the component template. Accepts wildcard expressions. If omitted,
 		 * all component templates are returned.
@@ -232,6 +269,9 @@ public ComponentTemplatesRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.local != null) {
 					params.put("local", String.valueOf(request.local));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ElasticsearchCatAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ElasticsearchCatAsyncClient.java
index 6a07e9fff..c748e1270 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ElasticsearchCatAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ElasticsearchCatAsyncClient.java
@@ -128,10 +128,10 @@ public CompletableFuture<AliasesResponse> aliases() {
 	// ----- Endpoint: cat.allocation
 
 	/**
-	 * Get shard allocation information. Get a snapshot of the number of shards
-	 * allocated to each data node and their disk space. IMPORTANT: cat APIs are
-	 * only intended for human consumption using the command line or Kibana console.
-	 * They are not intended for use by applications.
+	 * Provides a snapshot of the number of shards allocated to each data node and
+	 * their disk space. IMPORTANT: cat APIs are only intended for human consumption
+	 * using the command line or Kibana console. They are not intended for use by
+	 * applications.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-allocation.html">Documentation
@@ -146,10 +146,10 @@ public CompletableFuture<AllocationResponse> allocation(AllocationRequest reques
 	}
 
 	/**
-	 * Get shard allocation information. Get a snapshot of the number of shards
-	 * allocated to each data node and their disk space. IMPORTANT: cat APIs are
-	 * only intended for human consumption using the command line or Kibana console.
-	 * They are not intended for use by applications.
+	 * Provides a snapshot of the number of shards allocated to each data node and
+	 * their disk space. IMPORTANT: cat APIs are only intended for human consumption
+	 * using the command line or Kibana console. They are not intended for use by
+	 * applications.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -165,10 +165,10 @@ public final CompletableFuture<AllocationResponse> allocation(
 	}
 
 	/**
-	 * Get shard allocation information. Get a snapshot of the number of shards
-	 * allocated to each data node and their disk space. IMPORTANT: cat APIs are
-	 * only intended for human consumption using the command line or Kibana console.
-	 * They are not intended for use by applications.
+	 * Provides a snapshot of the number of shards allocated to each data node and
+	 * their disk space. IMPORTANT: cat APIs are only intended for human consumption
+	 * using the command line or Kibana console. They are not intended for use by
+	 * applications.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-allocation.html">Documentation
@@ -314,11 +314,11 @@ public CompletableFuture<CountResponse> count() {
 	// ----- Endpoint: cat.fielddata
 
 	/**
-	 * Get field data cache information. Get the amount of heap memory currently
-	 * used by the field data cache on every data node in the cluster. IMPORTANT:
-	 * cat APIs are only intended for human consumption using the command line or
-	 * Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes stats API.
+	 * Returns the amount of heap memory currently used by the field data cache on
+	 * every data node in the cluster. IMPORTANT: cat APIs are only intended for
+	 * human consumption using the command line or Kibana console. They are not
+	 * intended for use by applications. For application consumption, use the nodes
+	 * stats API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-fielddata.html">Documentation
@@ -333,11 +333,11 @@ public CompletableFuture<FielddataResponse> fielddata(FielddataRequest request)
 	}
 
 	/**
-	 * Get field data cache information. Get the amount of heap memory currently
-	 * used by the field data cache on every data node in the cluster. IMPORTANT:
-	 * cat APIs are only intended for human consumption using the command line or
-	 * Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes stats API.
+	 * Returns the amount of heap memory currently used by the field data cache on
+	 * every data node in the cluster. IMPORTANT: cat APIs are only intended for
+	 * human consumption using the command line or Kibana console. They are not
+	 * intended for use by applications. For application consumption, use the nodes
+	 * stats API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -353,11 +353,11 @@ public final CompletableFuture<FielddataResponse> fielddata(
 	}
 
 	/**
-	 * Get field data cache information. Get the amount of heap memory currently
-	 * used by the field data cache on every data node in the cluster. IMPORTANT:
-	 * cat APIs are only intended for human consumption using the command line or
-	 * Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes stats API.
+	 * Returns the amount of heap memory currently used by the field data cache on
+	 * every data node in the cluster. IMPORTANT: cat APIs are only intended for
+	 * human consumption using the command line or Kibana console. They are not
+	 * intended for use by applications. For application consumption, use the nodes
+	 * stats API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-fielddata.html">Documentation
@@ -372,18 +372,18 @@ public CompletableFuture<FielddataResponse> fielddata() {
 	// ----- Endpoint: cat.health
 
 	/**
-	 * Get the cluster health status. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * cluster health API. This API is often used to check malfunctioning clusters.
-	 * To help you track cluster health alongside log files and alerting systems,
-	 * the API returns timestamps in two formats: <code>HH:MM:SS</code>, which is
-	 * human-readable but includes no date information;
-	 * <code>Unix epoch time</code>, which is machine-sortable and includes date
-	 * information. The latter format is useful for cluster recoveries that take
-	 * multiple days. You can use the cat health API to verify cluster health across
-	 * multiple nodes. You also can use the API to track the recovery of a large
-	 * cluster over a longer period of time.
+	 * Returns the health status of a cluster, similar to the cluster health API.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the cluster health API. This API is often used
+	 * to check malfunctioning clusters. To help you track cluster health alongside
+	 * log files and alerting systems, the API returns timestamps in two formats:
+	 * <code>HH:MM:SS</code>, which is human-readable but includes no date
+	 * information; <code>Unix epoch time</code>, which is machine-sortable and
+	 * includes date information. The latter format is useful for cluster recoveries
+	 * that take multiple days. You can use the cat health API to verify cluster
+	 * health across multiple nodes. You also can use the API to track the recovery
+	 * of a large cluster over a longer period of time.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-health.html">Documentation
@@ -398,18 +398,18 @@ public CompletableFuture<HealthResponse> health(HealthRequest request) {
 	}
 
 	/**
-	 * Get the cluster health status. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * cluster health API. This API is often used to check malfunctioning clusters.
-	 * To help you track cluster health alongside log files and alerting systems,
-	 * the API returns timestamps in two formats: <code>HH:MM:SS</code>, which is
-	 * human-readable but includes no date information;
-	 * <code>Unix epoch time</code>, which is machine-sortable and includes date
-	 * information. The latter format is useful for cluster recoveries that take
-	 * multiple days. You can use the cat health API to verify cluster health across
-	 * multiple nodes. You also can use the API to track the recovery of a large
-	 * cluster over a longer period of time.
+	 * Returns the health status of a cluster, similar to the cluster health API.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the cluster health API. This API is often used
+	 * to check malfunctioning clusters. To help you track cluster health alongside
+	 * log files and alerting systems, the API returns timestamps in two formats:
+	 * <code>HH:MM:SS</code>, which is human-readable but includes no date
+	 * information; <code>Unix epoch time</code>, which is machine-sortable and
+	 * includes date information. The latter format is useful for cluster recoveries
+	 * that take multiple days. You can use the cat health API to verify cluster
+	 * health across multiple nodes. You also can use the API to track the recovery
+	 * of a large cluster over a longer period of time.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -425,18 +425,18 @@ public final CompletableFuture<HealthResponse> health(
 	}
 
 	/**
-	 * Get the cluster health status. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * cluster health API. This API is often used to check malfunctioning clusters.
-	 * To help you track cluster health alongside log files and alerting systems,
-	 * the API returns timestamps in two formats: <code>HH:MM:SS</code>, which is
-	 * human-readable but includes no date information;
-	 * <code>Unix epoch time</code>, which is machine-sortable and includes date
-	 * information. The latter format is useful for cluster recoveries that take
-	 * multiple days. You can use the cat health API to verify cluster health across
-	 * multiple nodes. You also can use the API to track the recovery of a large
-	 * cluster over a longer period of time.
+	 * Returns the health status of a cluster, similar to the cluster health API.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the cluster health API. This API is often used
+	 * to check malfunctioning clusters. To help you track cluster health alongside
+	 * log files and alerting systems, the API returns timestamps in two formats:
+	 * <code>HH:MM:SS</code>, which is human-readable but includes no date
+	 * information; <code>Unix epoch time</code>, which is machine-sortable and
+	 * includes date information. The latter format is useful for cluster recoveries
+	 * that take multiple days. You can use the cat health API to verify cluster
+	 * health across multiple nodes. You also can use the API to track the recovery
+	 * of a large cluster over a longer period of time.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-health.html">Documentation
@@ -570,11 +570,10 @@ public CompletableFuture<IndicesResponse> indices() {
 	// ----- Endpoint: cat.master
 
 	/**
-	 * Get master node information. Get information about the master node, including
-	 * the ID, bound IP address, and name. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the nodes
-	 * info API.
+	 * Returns information about the master node, including the ID, bound IP
+	 * address, and name. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-master.html">Documentation
@@ -589,11 +588,10 @@ public CompletableFuture<MasterResponse> master(MasterRequest request) {
 	}
 
 	/**
-	 * Get master node information. Get information about the master node, including
-	 * the ID, bound IP address, and name. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the nodes
-	 * info API.
+	 * Returns information about the master node, including the ID, bound IP
+	 * address, and name. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -609,11 +607,10 @@ public final CompletableFuture<MasterResponse> master(
 	}
 
 	/**
-	 * Get master node information. Get information about the master node, including
-	 * the ID, bound IP address, and name. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the nodes
-	 * info API.
+	 * Returns information about the master node, including the ID, bound IP
+	 * address, and name. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-master.html">Documentation
@@ -890,10 +887,10 @@ public CompletableFuture<MlTrainedModelsResponse> mlTrainedModels() {
 	// ----- Endpoint: cat.nodeattrs
 
 	/**
-	 * Get node attribute information. Get information about custom node attributes.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about custom node attributes. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-nodeattrs.html">Documentation
@@ -908,10 +905,10 @@ public CompletableFuture<NodeattrsResponse> nodeattrs(NodeattrsRequest request)
 	}
 
 	/**
-	 * Get node attribute information. Get information about custom node attributes.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about custom node attributes. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -927,10 +924,10 @@ public final CompletableFuture<NodeattrsResponse> nodeattrs(
 	}
 
 	/**
-	 * Get node attribute information. Get information about custom node attributes.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about custom node attributes. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-nodeattrs.html">Documentation
@@ -945,10 +942,10 @@ public CompletableFuture<NodeattrsResponse> nodeattrs() {
 	// ----- Endpoint: cat.nodes
 
 	/**
-	 * Get node information. Get information about the nodes in a cluster.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about the nodes in a cluster. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-nodes.html">Documentation
@@ -963,10 +960,10 @@ public CompletableFuture<NodesResponse> nodes(NodesRequest request) {
 	}
 
 	/**
-	 * Get node information. Get information about the nodes in a cluster.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about the nodes in a cluster. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -982,10 +979,10 @@ public final CompletableFuture<NodesResponse> nodes(
 	}
 
 	/**
-	 * Get node information. Get information about the nodes in a cluster.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about the nodes in a cluster. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-nodes.html">Documentation
@@ -1000,11 +997,10 @@ public CompletableFuture<NodesResponse> nodes() {
 	// ----- Endpoint: cat.pending_tasks
 
 	/**
-	 * Get pending task information. Get information about cluster-level changes
-	 * that have not yet taken effect. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * pending cluster tasks API.
+	 * Returns cluster-level changes that have not yet been executed. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the pending cluster tasks API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-pending-tasks.html">Documentation
@@ -1019,11 +1015,10 @@ public CompletableFuture<PendingTasksResponse> pendingTasks(PendingTasksRequest
 	}
 
 	/**
-	 * Get pending task information. Get information about cluster-level changes
-	 * that have not yet taken effect. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * pending cluster tasks API.
+	 * Returns cluster-level changes that have not yet been executed. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the pending cluster tasks API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1039,11 +1034,10 @@ public final CompletableFuture<PendingTasksResponse> pendingTasks(
 	}
 
 	/**
-	 * Get pending task information. Get information about cluster-level changes
-	 * that have not yet taken effect. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * pending cluster tasks API.
+	 * Returns cluster-level changes that have not yet been executed. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the pending cluster tasks API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-pending-tasks.html">Documentation
@@ -1058,10 +1052,10 @@ public CompletableFuture<PendingTasksResponse> pendingTasks() {
 	// ----- Endpoint: cat.plugins
 
 	/**
-	 * Get plugin information. Get a list of plugins running on each node of a
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns a list of plugins running on each node of a cluster. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-plugins.html">Documentation
@@ -1076,10 +1070,10 @@ public CompletableFuture<PluginsResponse> plugins(PluginsRequest request) {
 	}
 
 	/**
-	 * Get plugin information. Get a list of plugins running on each node of a
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns a list of plugins running on each node of a cluster. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1095,10 +1089,10 @@ public final CompletableFuture<PluginsResponse> plugins(
 	}
 
 	/**
-	 * Get plugin information. Get a list of plugins running on each node of a
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns a list of plugins running on each node of a cluster. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-plugins.html">Documentation
@@ -1113,15 +1107,15 @@ public CompletableFuture<PluginsResponse> plugins() {
 	// ----- Endpoint: cat.recovery
 
 	/**
-	 * Get shard recovery information. Get information about ongoing and completed
-	 * shard recoveries. Shard recovery is the process of initializing a shard copy,
-	 * such as restoring a primary shard from a snapshot or syncing a replica shard
-	 * from a primary shard. When a shard recovery completes, the recovered shard is
-	 * available for search and indexing. For data streams, the API returns
-	 * information about the stream’s backing indices. IMPORTANT: cat APIs are only
-	 * intended for human consumption using the command line or Kibana console. They
-	 * are not intended for use by applications. For application consumption, use
-	 * the index recovery API.
+	 * Returns information about ongoing and completed shard recoveries. Shard
+	 * recovery is the process of initializing a shard copy, such as restoring a
+	 * primary shard from a snapshot or syncing a replica shard from a primary
+	 * shard. When a shard recovery completes, the recovered shard is available for
+	 * search and indexing. For data streams, the API returns information about the
+	 * stream’s backing indices. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the index recovery
+	 * API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-recovery.html">Documentation
@@ -1136,15 +1130,15 @@ public CompletableFuture<RecoveryResponse> recovery(RecoveryRequest request) {
 	}
 
 	/**
-	 * Get shard recovery information. Get information about ongoing and completed
-	 * shard recoveries. Shard recovery is the process of initializing a shard copy,
-	 * such as restoring a primary shard from a snapshot or syncing a replica shard
-	 * from a primary shard. When a shard recovery completes, the recovered shard is
-	 * available for search and indexing. For data streams, the API returns
-	 * information about the stream’s backing indices. IMPORTANT: cat APIs are only
-	 * intended for human consumption using the command line or Kibana console. They
-	 * are not intended for use by applications. For application consumption, use
-	 * the index recovery API.
+	 * Returns information about ongoing and completed shard recoveries. Shard
+	 * recovery is the process of initializing a shard copy, such as restoring a
+	 * primary shard from a snapshot or syncing a replica shard from a primary
+	 * shard. When a shard recovery completes, the recovered shard is available for
+	 * search and indexing. For data streams, the API returns information about the
+	 * stream’s backing indices. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the index recovery
+	 * API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1160,15 +1154,15 @@ public final CompletableFuture<RecoveryResponse> recovery(
 	}
 
 	/**
-	 * Get shard recovery information. Get information about ongoing and completed
-	 * shard recoveries. Shard recovery is the process of initializing a shard copy,
-	 * such as restoring a primary shard from a snapshot or syncing a replica shard
-	 * from a primary shard. When a shard recovery completes, the recovered shard is
-	 * available for search and indexing. For data streams, the API returns
-	 * information about the stream’s backing indices. IMPORTANT: cat APIs are only
-	 * intended for human consumption using the command line or Kibana console. They
-	 * are not intended for use by applications. For application consumption, use
-	 * the index recovery API.
+	 * Returns information about ongoing and completed shard recoveries. Shard
+	 * recovery is the process of initializing a shard copy, such as restoring a
+	 * primary shard from a snapshot or syncing a replica shard from a primary
+	 * shard. When a shard recovery completes, the recovered shard is available for
+	 * search and indexing. For data streams, the API returns information about the
+	 * stream’s backing indices. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the index recovery
+	 * API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-recovery.html">Documentation
@@ -1183,29 +1177,66 @@ public CompletableFuture<RecoveryResponse> recovery() {
 	// ----- Endpoint: cat.repositories
 
 	/**
-	 * Get snapshot repository information. Get a list of snapshot repositories for
-	 * a cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the get snapshot repository
-	 * API.
+	 * Returns the snapshot repositories for a cluster. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications. For application consumption, use
+	 * the get snapshot repository API.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-repositories.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public CompletableFuture<RepositoriesResponse> repositories(RepositoriesRequest request) {
+		@SuppressWarnings("unchecked")
+		JsonEndpoint<RepositoriesRequest, RepositoriesResponse, ErrorResponse> endpoint = (JsonEndpoint<RepositoriesRequest, RepositoriesResponse, ErrorResponse>) RepositoriesRequest._ENDPOINT;
+
+		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+	}
+
+	/**
+	 * Returns the snapshot repositories for a cluster. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications. For application consumption, use
+	 * the get snapshot repository API.
+	 * 
+	 * @param fn
+	 *            a function that initializes a builder to create the
+	 *            {@link RepositoriesRequest}
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-repositories.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public final CompletableFuture<RepositoriesResponse> repositories(
+			Function<RepositoriesRequest.Builder, ObjectBuilder<RepositoriesRequest>> fn) {
+		return repositories(fn.apply(new RepositoriesRequest.Builder()).build());
+	}
+
+	/**
+	 * Returns the snapshot repositories for a cluster. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications. For application consumption, use
+	 * the get snapshot repository API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-repositories.html">Documentation
 	 *      on elastic.co</a>
 	 */
+
 	public CompletableFuture<RepositoriesResponse> repositories() {
-		return this.transport.performRequestAsync(RepositoriesRequest._INSTANCE, RepositoriesRequest._ENDPOINT,
-				this.transportOptions);
+		return this.transport.performRequestAsync(new RepositoriesRequest.Builder().build(),
+				RepositoriesRequest._ENDPOINT, this.transportOptions);
 	}
 
 	// ----- Endpoint: cat.segments
 
 	/**
-	 * Get segment information. Get low-level information about the Lucene segments
-	 * in index shards. For data streams, the API returns information about the
-	 * backing indices. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the index segments API.
+	 * Returns low-level information about the Lucene segments in index shards. For
+	 * data streams, the API returns information about the backing indices.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the index segments API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-segments.html">Documentation
@@ -1220,11 +1251,11 @@ public CompletableFuture<SegmentsResponse> segments(SegmentsRequest request) {
 	}
 
 	/**
-	 * Get segment information. Get low-level information about the Lucene segments
-	 * in index shards. For data streams, the API returns information about the
-	 * backing indices. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the index segments API.
+	 * Returns low-level information about the Lucene segments in index shards. For
+	 * data streams, the API returns information about the backing indices.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the index segments API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1240,11 +1271,11 @@ public final CompletableFuture<SegmentsResponse> segments(
 	}
 
 	/**
-	 * Get segment information. Get low-level information about the Lucene segments
-	 * in index shards. For data streams, the API returns information about the
-	 * backing indices. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the index segments API.
+	 * Returns low-level information about the Lucene segments in index shards. For
+	 * data streams, the API returns information about the backing indices.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the index segments API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-segments.html">Documentation
@@ -1259,10 +1290,10 @@ public CompletableFuture<SegmentsResponse> segments() {
 	// ----- Endpoint: cat.shards
 
 	/**
-	 * Get shard information. Get information about the shards in a cluster. For
-	 * data streams, the API returns information about the backing indices.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications.
+	 * Returns information about the shards in a cluster. For data streams, the API
+	 * returns information about the backing indices. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-shards.html">Documentation
@@ -1277,10 +1308,10 @@ public CompletableFuture<ShardsResponse> shards(ShardsRequest request) {
 	}
 
 	/**
-	 * Get shard information. Get information about the shards in a cluster. For
-	 * data streams, the API returns information about the backing indices.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications.
+	 * Returns information about the shards in a cluster. For data streams, the API
+	 * returns information about the backing indices. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1296,10 +1327,10 @@ public final CompletableFuture<ShardsResponse> shards(
 	}
 
 	/**
-	 * Get shard information. Get information about the shards in a cluster. For
-	 * data streams, the API returns information about the backing indices.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications.
+	 * Returns information about the shards in a cluster. For data streams, the API
+	 * returns information about the backing indices. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-shards.html">Documentation
@@ -1314,12 +1345,11 @@ public CompletableFuture<ShardsResponse> shards() {
 	// ----- Endpoint: cat.snapshots
 
 	/**
-	 * Get snapshot information Get information about the snapshots stored in one or
-	 * more repositories. A snapshot is a backup of an index or running
-	 * Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human
-	 * consumption using the command line or Kibana console. They are not intended
-	 * for use by applications. For application consumption, use the get snapshot
-	 * API.
+	 * Returns information about the snapshots stored in one or more repositories. A
+	 * snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT:
+	 * cat APIs are only intended for human consumption using the command line or
+	 * Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the get snapshot API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-snapshots.html">Documentation
@@ -1334,12 +1364,11 @@ public CompletableFuture<SnapshotsResponse> snapshots(SnapshotsRequest request)
 	}
 
 	/**
-	 * Get snapshot information Get information about the snapshots stored in one or
-	 * more repositories. A snapshot is a backup of an index or running
-	 * Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human
-	 * consumption using the command line or Kibana console. They are not intended
-	 * for use by applications. For application consumption, use the get snapshot
-	 * API.
+	 * Returns information about the snapshots stored in one or more repositories. A
+	 * snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT:
+	 * cat APIs are only intended for human consumption using the command line or
+	 * Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the get snapshot API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1355,12 +1384,11 @@ public final CompletableFuture<SnapshotsResponse> snapshots(
 	}
 
 	/**
-	 * Get snapshot information Get information about the snapshots stored in one or
-	 * more repositories. A snapshot is a backup of an index or running
-	 * Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human
-	 * consumption using the command line or Kibana console. They are not intended
-	 * for use by applications. For application consumption, use the get snapshot
-	 * API.
+	 * Returns information about the snapshots stored in one or more repositories. A
+	 * snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT:
+	 * cat APIs are only intended for human consumption using the command line or
+	 * Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the get snapshot API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-snapshots.html">Documentation
@@ -1375,10 +1403,10 @@ public CompletableFuture<SnapshotsResponse> snapshots() {
 	// ----- Endpoint: cat.tasks
 
 	/**
-	 * Get task information. Get information about tasks currently running in the
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the task management API.
+	 * Returns information about tasks currently executing in the cluster.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the task management API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/tasks.html">Documentation
@@ -1393,10 +1421,10 @@ public CompletableFuture<TasksResponse> tasks(TasksRequest request) {
 	}
 
 	/**
-	 * Get task information. Get information about tasks currently running in the
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the task management API.
+	 * Returns information about tasks currently executing in the cluster.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the task management API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1412,10 +1440,10 @@ public final CompletableFuture<TasksResponse> tasks(
 	}
 
 	/**
-	 * Get task information. Get information about tasks currently running in the
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the task management API.
+	 * Returns information about tasks currently executing in the cluster.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the task management API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/tasks.html">Documentation
@@ -1430,12 +1458,11 @@ public CompletableFuture<TasksResponse> tasks() {
 	// ----- Endpoint: cat.templates
 
 	/**
-	 * Get index template information. Get information about the index templates in
-	 * a cluster. You can use index templates to apply index settings and field
-	 * mappings to new indices at creation. IMPORTANT: cat APIs are only intended
-	 * for human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the get
-	 * index template API.
+	 * Returns information about index templates in a cluster. You can use index
+	 * templates to apply index settings and field mappings to new indices at
+	 * creation. IMPORTANT: cat APIs are only intended for human consumption using
+	 * the command line or Kibana console. They are not intended for use by
+	 * applications. For application consumption, use the get index template API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-templates.html">Documentation
@@ -1450,12 +1477,11 @@ public CompletableFuture<TemplatesResponse> templates(TemplatesRequest request)
 	}
 
 	/**
-	 * Get index template information. Get information about the index templates in
-	 * a cluster. You can use index templates to apply index settings and field
-	 * mappings to new indices at creation. IMPORTANT: cat APIs are only intended
-	 * for human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the get
-	 * index template API.
+	 * Returns information about index templates in a cluster. You can use index
+	 * templates to apply index settings and field mappings to new indices at
+	 * creation. IMPORTANT: cat APIs are only intended for human consumption using
+	 * the command line or Kibana console. They are not intended for use by
+	 * applications. For application consumption, use the get index template API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1471,12 +1497,11 @@ public final CompletableFuture<TemplatesResponse> templates(
 	}
 
 	/**
-	 * Get index template information. Get information about the index templates in
-	 * a cluster. You can use index templates to apply index settings and field
-	 * mappings to new indices at creation. IMPORTANT: cat APIs are only intended
-	 * for human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the get
-	 * index template API.
+	 * Returns information about index templates in a cluster. You can use index
+	 * templates to apply index settings and field mappings to new indices at
+	 * creation. IMPORTANT: cat APIs are only intended for human consumption using
+	 * the command line or Kibana console. They are not intended for use by
+	 * applications. For application consumption, use the get index template API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-templates.html">Documentation
@@ -1491,11 +1516,11 @@ public CompletableFuture<TemplatesResponse> templates() {
 	// ----- Endpoint: cat.thread_pool
 
 	/**
-	 * Get thread pool statistics. Get thread pool statistics for each node in a
-	 * cluster. Returned information includes all built-in thread pools and custom
-	 * thread pools. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns thread pool statistics for each node in a cluster. Returned
+	 * information includes all built-in thread pools and custom thread pools.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-thread-pool.html">Documentation
@@ -1510,11 +1535,11 @@ public CompletableFuture<ThreadPoolResponse> threadPool(ThreadPoolRequest reques
 	}
 
 	/**
-	 * Get thread pool statistics. Get thread pool statistics for each node in a
-	 * cluster. Returned information includes all built-in thread pools and custom
-	 * thread pools. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns thread pool statistics for each node in a cluster. Returned
+	 * information includes all built-in thread pools and custom thread pools.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1530,11 +1555,11 @@ public final CompletableFuture<ThreadPoolResponse> threadPool(
 	}
 
 	/**
-	 * Get thread pool statistics. Get thread pool statistics for each node in a
-	 * cluster. Returned information includes all built-in thread pools and custom
-	 * thread pools. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns thread pool statistics for each node in a cluster. Returned
+	 * information includes all built-in thread pools and custom thread pools.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-thread-pool.html">Documentation
@@ -1549,8 +1574,7 @@ public CompletableFuture<ThreadPoolResponse> threadPool() {
 	// ----- Endpoint: cat.transforms
 
 	/**
-	 * Get transform information. Get configuration and usage information about
-	 * transforms.
+	 * Get transforms. Returns configuration and usage information about transforms.
 	 * <p>
 	 * CAT APIs are only intended for human consumption using the Kibana console or
 	 * command line. They are not intended for use by applications. For application
@@ -1569,8 +1593,7 @@ public CompletableFuture<TransformsResponse> transforms(TransformsRequest reques
 	}
 
 	/**
-	 * Get transform information. Get configuration and usage information about
-	 * transforms.
+	 * Get transforms. Returns configuration and usage information about transforms.
 	 * <p>
 	 * CAT APIs are only intended for human consumption using the Kibana console or
 	 * command line. They are not intended for use by applications. For application
@@ -1590,8 +1613,7 @@ public final CompletableFuture<TransformsResponse> transforms(
 	}
 
 	/**
-	 * Get transform information. Get configuration and usage information about
-	 * transforms.
+	 * Get transforms. Returns configuration and usage information about transforms.
 	 * <p>
 	 * CAT APIs are only intended for human consumption using the Kibana console or
 	 * command line. They are not intended for use by applications. For application
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ElasticsearchCatClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ElasticsearchCatClient.java
index 5a7d5602b..53001f7be 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ElasticsearchCatClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ElasticsearchCatClient.java
@@ -129,10 +129,10 @@ public AliasesResponse aliases() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.allocation
 
 	/**
-	 * Get shard allocation information. Get a snapshot of the number of shards
-	 * allocated to each data node and their disk space. IMPORTANT: cat APIs are
-	 * only intended for human consumption using the command line or Kibana console.
-	 * They are not intended for use by applications.
+	 * Provides a snapshot of the number of shards allocated to each data node and
+	 * their disk space. IMPORTANT: cat APIs are only intended for human consumption
+	 * using the command line or Kibana console. They are not intended for use by
+	 * applications.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-allocation.html">Documentation
@@ -147,10 +147,10 @@ public AllocationResponse allocation(AllocationRequest request) throws IOExcepti
 	}
 
 	/**
-	 * Get shard allocation information. Get a snapshot of the number of shards
-	 * allocated to each data node and their disk space. IMPORTANT: cat APIs are
-	 * only intended for human consumption using the command line or Kibana console.
-	 * They are not intended for use by applications.
+	 * Provides a snapshot of the number of shards allocated to each data node and
+	 * their disk space. IMPORTANT: cat APIs are only intended for human consumption
+	 * using the command line or Kibana console. They are not intended for use by
+	 * applications.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -166,10 +166,10 @@ public final AllocationResponse allocation(Function<AllocationRequest.Builder, O
 	}
 
 	/**
-	 * Get shard allocation information. Get a snapshot of the number of shards
-	 * allocated to each data node and their disk space. IMPORTANT: cat APIs are
-	 * only intended for human consumption using the command line or Kibana console.
-	 * They are not intended for use by applications.
+	 * Provides a snapshot of the number of shards allocated to each data node and
+	 * their disk space. IMPORTANT: cat APIs are only intended for human consumption
+	 * using the command line or Kibana console. They are not intended for use by
+	 * applications.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-allocation.html">Documentation
@@ -317,11 +317,11 @@ public CountResponse count() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.fielddata
 
 	/**
-	 * Get field data cache information. Get the amount of heap memory currently
-	 * used by the field data cache on every data node in the cluster. IMPORTANT:
-	 * cat APIs are only intended for human consumption using the command line or
-	 * Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes stats API.
+	 * Returns the amount of heap memory currently used by the field data cache on
+	 * every data node in the cluster. IMPORTANT: cat APIs are only intended for
+	 * human consumption using the command line or Kibana console. They are not
+	 * intended for use by applications. For application consumption, use the nodes
+	 * stats API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-fielddata.html">Documentation
@@ -336,11 +336,11 @@ public FielddataResponse fielddata(FielddataRequest request) throws IOException,
 	}
 
 	/**
-	 * Get field data cache information. Get the amount of heap memory currently
-	 * used by the field data cache on every data node in the cluster. IMPORTANT:
-	 * cat APIs are only intended for human consumption using the command line or
-	 * Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes stats API.
+	 * Returns the amount of heap memory currently used by the field data cache on
+	 * every data node in the cluster. IMPORTANT: cat APIs are only intended for
+	 * human consumption using the command line or Kibana console. They are not
+	 * intended for use by applications. For application consumption, use the nodes
+	 * stats API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -356,11 +356,11 @@ public final FielddataResponse fielddata(Function<FielddataRequest.Builder, Obje
 	}
 
 	/**
-	 * Get field data cache information. Get the amount of heap memory currently
-	 * used by the field data cache on every data node in the cluster. IMPORTANT:
-	 * cat APIs are only intended for human consumption using the command line or
-	 * Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes stats API.
+	 * Returns the amount of heap memory currently used by the field data cache on
+	 * every data node in the cluster. IMPORTANT: cat APIs are only intended for
+	 * human consumption using the command line or Kibana console. They are not
+	 * intended for use by applications. For application consumption, use the nodes
+	 * stats API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-fielddata.html">Documentation
@@ -375,18 +375,18 @@ public FielddataResponse fielddata() throws IOException, ElasticsearchException
 	// ----- Endpoint: cat.health
 
 	/**
-	 * Get the cluster health status. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * cluster health API. This API is often used to check malfunctioning clusters.
-	 * To help you track cluster health alongside log files and alerting systems,
-	 * the API returns timestamps in two formats: <code>HH:MM:SS</code>, which is
-	 * human-readable but includes no date information;
-	 * <code>Unix epoch time</code>, which is machine-sortable and includes date
-	 * information. The latter format is useful for cluster recoveries that take
-	 * multiple days. You can use the cat health API to verify cluster health across
-	 * multiple nodes. You also can use the API to track the recovery of a large
-	 * cluster over a longer period of time.
+	 * Returns the health status of a cluster, similar to the cluster health API.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the cluster health API. This API is often used
+	 * to check malfunctioning clusters. To help you track cluster health alongside
+	 * log files and alerting systems, the API returns timestamps in two formats:
+	 * <code>HH:MM:SS</code>, which is human-readable but includes no date
+	 * information; <code>Unix epoch time</code>, which is machine-sortable and
+	 * includes date information. The latter format is useful for cluster recoveries
+	 * that take multiple days. You can use the cat health API to verify cluster
+	 * health across multiple nodes. You also can use the API to track the recovery
+	 * of a large cluster over a longer period of time.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-health.html">Documentation
@@ -401,18 +401,18 @@ public HealthResponse health(HealthRequest request) throws IOException, Elastics
 	}
 
 	/**
-	 * Get the cluster health status. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * cluster health API. This API is often used to check malfunctioning clusters.
-	 * To help you track cluster health alongside log files and alerting systems,
-	 * the API returns timestamps in two formats: <code>HH:MM:SS</code>, which is
-	 * human-readable but includes no date information;
-	 * <code>Unix epoch time</code>, which is machine-sortable and includes date
-	 * information. The latter format is useful for cluster recoveries that take
-	 * multiple days. You can use the cat health API to verify cluster health across
-	 * multiple nodes. You also can use the API to track the recovery of a large
-	 * cluster over a longer period of time.
+	 * Returns the health status of a cluster, similar to the cluster health API.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the cluster health API. This API is often used
+	 * to check malfunctioning clusters. To help you track cluster health alongside
+	 * log files and alerting systems, the API returns timestamps in two formats:
+	 * <code>HH:MM:SS</code>, which is human-readable but includes no date
+	 * information; <code>Unix epoch time</code>, which is machine-sortable and
+	 * includes date information. The latter format is useful for cluster recoveries
+	 * that take multiple days. You can use the cat health API to verify cluster
+	 * health across multiple nodes. You also can use the API to track the recovery
+	 * of a large cluster over a longer period of time.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -428,18 +428,18 @@ public final HealthResponse health(Function<HealthRequest.Builder, ObjectBuilder
 	}
 
 	/**
-	 * Get the cluster health status. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * cluster health API. This API is often used to check malfunctioning clusters.
-	 * To help you track cluster health alongside log files and alerting systems,
-	 * the API returns timestamps in two formats: <code>HH:MM:SS</code>, which is
-	 * human-readable but includes no date information;
-	 * <code>Unix epoch time</code>, which is machine-sortable and includes date
-	 * information. The latter format is useful for cluster recoveries that take
-	 * multiple days. You can use the cat health API to verify cluster health across
-	 * multiple nodes. You also can use the API to track the recovery of a large
-	 * cluster over a longer period of time.
+	 * Returns the health status of a cluster, similar to the cluster health API.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the cluster health API. This API is often used
+	 * to check malfunctioning clusters. To help you track cluster health alongside
+	 * log files and alerting systems, the API returns timestamps in two formats:
+	 * <code>HH:MM:SS</code>, which is human-readable but includes no date
+	 * information; <code>Unix epoch time</code>, which is machine-sortable and
+	 * includes date information. The latter format is useful for cluster recoveries
+	 * that take multiple days. You can use the cat health API to verify cluster
+	 * health across multiple nodes. You also can use the API to track the recovery
+	 * of a large cluster over a longer period of time.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-health.html">Documentation
@@ -573,11 +573,10 @@ public IndicesResponse indices() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.master
 
 	/**
-	 * Get master node information. Get information about the master node, including
-	 * the ID, bound IP address, and name. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the nodes
-	 * info API.
+	 * Returns information about the master node, including the ID, bound IP
+	 * address, and name. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-master.html">Documentation
@@ -592,11 +591,10 @@ public MasterResponse master(MasterRequest request) throws IOException, Elastics
 	}
 
 	/**
-	 * Get master node information. Get information about the master node, including
-	 * the ID, bound IP address, and name. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the nodes
-	 * info API.
+	 * Returns information about the master node, including the ID, bound IP
+	 * address, and name. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -612,11 +610,10 @@ public final MasterResponse master(Function<MasterRequest.Builder, ObjectBuilder
 	}
 
 	/**
-	 * Get master node information. Get information about the master node, including
-	 * the ID, bound IP address, and name. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the nodes
-	 * info API.
+	 * Returns information about the master node, including the ID, bound IP
+	 * address, and name. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-master.html">Documentation
@@ -898,10 +895,10 @@ public MlTrainedModelsResponse mlTrainedModels() throws IOException, Elasticsear
 	// ----- Endpoint: cat.nodeattrs
 
 	/**
-	 * Get node attribute information. Get information about custom node attributes.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about custom node attributes. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-nodeattrs.html">Documentation
@@ -916,10 +913,10 @@ public NodeattrsResponse nodeattrs(NodeattrsRequest request) throws IOException,
 	}
 
 	/**
-	 * Get node attribute information. Get information about custom node attributes.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about custom node attributes. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -935,10 +932,10 @@ public final NodeattrsResponse nodeattrs(Function<NodeattrsRequest.Builder, Obje
 	}
 
 	/**
-	 * Get node attribute information. Get information about custom node attributes.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about custom node attributes. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-nodeattrs.html">Documentation
@@ -953,10 +950,10 @@ public NodeattrsResponse nodeattrs() throws IOException, ElasticsearchException
 	// ----- Endpoint: cat.nodes
 
 	/**
-	 * Get node information. Get information about the nodes in a cluster.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about the nodes in a cluster. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-nodes.html">Documentation
@@ -971,10 +968,10 @@ public NodesResponse nodes(NodesRequest request) throws IOException, Elasticsear
 	}
 
 	/**
-	 * Get node information. Get information about the nodes in a cluster.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about the nodes in a cluster. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -990,10 +987,10 @@ public final NodesResponse nodes(Function<NodesRequest.Builder, ObjectBuilder<No
 	}
 
 	/**
-	 * Get node information. Get information about the nodes in a cluster.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications. For
-	 * application consumption, use the nodes info API.
+	 * Returns information about the nodes in a cluster. IMPORTANT: cat APIs are
+	 * only intended for human consumption using the command line or Kibana console.
+	 * They are not intended for use by applications. For application consumption,
+	 * use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-nodes.html">Documentation
@@ -1008,11 +1005,10 @@ public NodesResponse nodes() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.pending_tasks
 
 	/**
-	 * Get pending task information. Get information about cluster-level changes
-	 * that have not yet taken effect. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * pending cluster tasks API.
+	 * Returns cluster-level changes that have not yet been executed. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the pending cluster tasks API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-pending-tasks.html">Documentation
@@ -1027,11 +1023,10 @@ public PendingTasksResponse pendingTasks(PendingTasksRequest request) throws IOE
 	}
 
 	/**
-	 * Get pending task information. Get information about cluster-level changes
-	 * that have not yet taken effect. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * pending cluster tasks API.
+	 * Returns cluster-level changes that have not yet been executed. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the pending cluster tasks API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1048,11 +1043,10 @@ public final PendingTasksResponse pendingTasks(
 	}
 
 	/**
-	 * Get pending task information. Get information about cluster-level changes
-	 * that have not yet taken effect. IMPORTANT: cat APIs are only intended for
-	 * human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the
-	 * pending cluster tasks API.
+	 * Returns cluster-level changes that have not yet been executed. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the pending cluster tasks API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-pending-tasks.html">Documentation
@@ -1067,10 +1061,10 @@ public PendingTasksResponse pendingTasks() throws IOException, ElasticsearchExce
 	// ----- Endpoint: cat.plugins
 
 	/**
-	 * Get plugin information. Get a list of plugins running on each node of a
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns a list of plugins running on each node of a cluster. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-plugins.html">Documentation
@@ -1085,10 +1079,10 @@ public PluginsResponse plugins(PluginsRequest request) throws IOException, Elast
 	}
 
 	/**
-	 * Get plugin information. Get a list of plugins running on each node of a
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns a list of plugins running on each node of a cluster. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1104,10 +1098,10 @@ public final PluginsResponse plugins(Function<PluginsRequest.Builder, ObjectBuil
 	}
 
 	/**
-	 * Get plugin information. Get a list of plugins running on each node of a
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns a list of plugins running on each node of a cluster. IMPORTANT: cat
+	 * APIs are only intended for human consumption using the command line or Kibana
+	 * console. They are not intended for use by applications. For application
+	 * consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-plugins.html">Documentation
@@ -1122,15 +1116,15 @@ public PluginsResponse plugins() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.recovery
 
 	/**
-	 * Get shard recovery information. Get information about ongoing and completed
-	 * shard recoveries. Shard recovery is the process of initializing a shard copy,
-	 * such as restoring a primary shard from a snapshot or syncing a replica shard
-	 * from a primary shard. When a shard recovery completes, the recovered shard is
-	 * available for search and indexing. For data streams, the API returns
-	 * information about the stream’s backing indices. IMPORTANT: cat APIs are only
-	 * intended for human consumption using the command line or Kibana console. They
-	 * are not intended for use by applications. For application consumption, use
-	 * the index recovery API.
+	 * Returns information about ongoing and completed shard recoveries. Shard
+	 * recovery is the process of initializing a shard copy, such as restoring a
+	 * primary shard from a snapshot or syncing a replica shard from a primary
+	 * shard. When a shard recovery completes, the recovered shard is available for
+	 * search and indexing. For data streams, the API returns information about the
+	 * stream’s backing indices. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the index recovery
+	 * API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-recovery.html">Documentation
@@ -1145,15 +1139,15 @@ public RecoveryResponse recovery(RecoveryRequest request) throws IOException, El
 	}
 
 	/**
-	 * Get shard recovery information. Get information about ongoing and completed
-	 * shard recoveries. Shard recovery is the process of initializing a shard copy,
-	 * such as restoring a primary shard from a snapshot or syncing a replica shard
-	 * from a primary shard. When a shard recovery completes, the recovered shard is
-	 * available for search and indexing. For data streams, the API returns
-	 * information about the stream’s backing indices. IMPORTANT: cat APIs are only
-	 * intended for human consumption using the command line or Kibana console. They
-	 * are not intended for use by applications. For application consumption, use
-	 * the index recovery API.
+	 * Returns information about ongoing and completed shard recoveries. Shard
+	 * recovery is the process of initializing a shard copy, such as restoring a
+	 * primary shard from a snapshot or syncing a replica shard from a primary
+	 * shard. When a shard recovery completes, the recovered shard is available for
+	 * search and indexing. For data streams, the API returns information about the
+	 * stream’s backing indices. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the index recovery
+	 * API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1169,15 +1163,15 @@ public final RecoveryResponse recovery(Function<RecoveryRequest.Builder, ObjectB
 	}
 
 	/**
-	 * Get shard recovery information. Get information about ongoing and completed
-	 * shard recoveries. Shard recovery is the process of initializing a shard copy,
-	 * such as restoring a primary shard from a snapshot or syncing a replica shard
-	 * from a primary shard. When a shard recovery completes, the recovered shard is
-	 * available for search and indexing. For data streams, the API returns
-	 * information about the stream’s backing indices. IMPORTANT: cat APIs are only
-	 * intended for human consumption using the command line or Kibana console. They
-	 * are not intended for use by applications. For application consumption, use
-	 * the index recovery API.
+	 * Returns information about ongoing and completed shard recoveries. Shard
+	 * recovery is the process of initializing a shard copy, such as restoring a
+	 * primary shard from a snapshot or syncing a replica shard from a primary
+	 * shard. When a shard recovery completes, the recovered shard is available for
+	 * search and indexing. For data streams, the API returns information about the
+	 * stream’s backing indices. IMPORTANT: cat APIs are only intended for human
+	 * consumption using the command line or Kibana console. They are not intended
+	 * for use by applications. For application consumption, use the index recovery
+	 * API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-recovery.html">Documentation
@@ -1192,29 +1186,67 @@ public RecoveryResponse recovery() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.repositories
 
 	/**
-	 * Get snapshot repository information. Get a list of snapshot repositories for
-	 * a cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the get snapshot repository
-	 * API.
+	 * Returns the snapshot repositories for a cluster. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications. For application consumption, use
+	 * the get snapshot repository API.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-repositories.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public RepositoriesResponse repositories(RepositoriesRequest request) throws IOException, ElasticsearchException {
+		@SuppressWarnings("unchecked")
+		JsonEndpoint<RepositoriesRequest, RepositoriesResponse, ErrorResponse> endpoint = (JsonEndpoint<RepositoriesRequest, RepositoriesResponse, ErrorResponse>) RepositoriesRequest._ENDPOINT;
+
+		return this.transport.performRequest(request, endpoint, this.transportOptions);
+	}
+
+	/**
+	 * Returns the snapshot repositories for a cluster. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications. For application consumption, use
+	 * the get snapshot repository API.
+	 * 
+	 * @param fn
+	 *            a function that initializes a builder to create the
+	 *            {@link RepositoriesRequest}
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-repositories.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public final RepositoriesResponse repositories(
+			Function<RepositoriesRequest.Builder, ObjectBuilder<RepositoriesRequest>> fn)
+			throws IOException, ElasticsearchException {
+		return repositories(fn.apply(new RepositoriesRequest.Builder()).build());
+	}
+
+	/**
+	 * Returns the snapshot repositories for a cluster. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications. For application consumption, use
+	 * the get snapshot repository API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-repositories.html">Documentation
 	 *      on elastic.co</a>
 	 */
+
 	public RepositoriesResponse repositories() throws IOException, ElasticsearchException {
-		return this.transport.performRequest(RepositoriesRequest._INSTANCE, RepositoriesRequest._ENDPOINT,
+		return this.transport.performRequest(new RepositoriesRequest.Builder().build(), RepositoriesRequest._ENDPOINT,
 				this.transportOptions);
 	}
 
 	// ----- Endpoint: cat.segments
 
 	/**
-	 * Get segment information. Get low-level information about the Lucene segments
-	 * in index shards. For data streams, the API returns information about the
-	 * backing indices. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the index segments API.
+	 * Returns low-level information about the Lucene segments in index shards. For
+	 * data streams, the API returns information about the backing indices.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the index segments API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-segments.html">Documentation
@@ -1229,11 +1261,11 @@ public SegmentsResponse segments(SegmentsRequest request) throws IOException, El
 	}
 
 	/**
-	 * Get segment information. Get low-level information about the Lucene segments
-	 * in index shards. For data streams, the API returns information about the
-	 * backing indices. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the index segments API.
+	 * Returns low-level information about the Lucene segments in index shards. For
+	 * data streams, the API returns information about the backing indices.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the index segments API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1249,11 +1281,11 @@ public final SegmentsResponse segments(Function<SegmentsRequest.Builder, ObjectB
 	}
 
 	/**
-	 * Get segment information. Get low-level information about the Lucene segments
-	 * in index shards. For data streams, the API returns information about the
-	 * backing indices. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the index segments API.
+	 * Returns low-level information about the Lucene segments in index shards. For
+	 * data streams, the API returns information about the backing indices.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the index segments API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-segments.html">Documentation
@@ -1268,10 +1300,10 @@ public SegmentsResponse segments() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.shards
 
 	/**
-	 * Get shard information. Get information about the shards in a cluster. For
-	 * data streams, the API returns information about the backing indices.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications.
+	 * Returns information about the shards in a cluster. For data streams, the API
+	 * returns information about the backing indices. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-shards.html">Documentation
@@ -1286,10 +1318,10 @@ public ShardsResponse shards(ShardsRequest request) throws IOException, Elastics
 	}
 
 	/**
-	 * Get shard information. Get information about the shards in a cluster. For
-	 * data streams, the API returns information about the backing indices.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications.
+	 * Returns information about the shards in a cluster. For data streams, the API
+	 * returns information about the backing indices. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1305,10 +1337,10 @@ public final ShardsResponse shards(Function<ShardsRequest.Builder, ObjectBuilder
 	}
 
 	/**
-	 * Get shard information. Get information about the shards in a cluster. For
-	 * data streams, the API returns information about the backing indices.
-	 * IMPORTANT: cat APIs are only intended for human consumption using the command
-	 * line or Kibana console. They are not intended for use by applications.
+	 * Returns information about the shards in a cluster. For data streams, the API
+	 * returns information about the backing indices. IMPORTANT: cat APIs are only
+	 * intended for human consumption using the command line or Kibana console. They
+	 * are not intended for use by applications.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-shards.html">Documentation
@@ -1323,12 +1355,11 @@ public ShardsResponse shards() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.snapshots
 
 	/**
-	 * Get snapshot information Get information about the snapshots stored in one or
-	 * more repositories. A snapshot is a backup of an index or running
-	 * Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human
-	 * consumption using the command line or Kibana console. They are not intended
-	 * for use by applications. For application consumption, use the get snapshot
-	 * API.
+	 * Returns information about the snapshots stored in one or more repositories. A
+	 * snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT:
+	 * cat APIs are only intended for human consumption using the command line or
+	 * Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the get snapshot API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-snapshots.html">Documentation
@@ -1343,12 +1374,11 @@ public SnapshotsResponse snapshots(SnapshotsRequest request) throws IOException,
 	}
 
 	/**
-	 * Get snapshot information Get information about the snapshots stored in one or
-	 * more repositories. A snapshot is a backup of an index or running
-	 * Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human
-	 * consumption using the command line or Kibana console. They are not intended
-	 * for use by applications. For application consumption, use the get snapshot
-	 * API.
+	 * Returns information about the snapshots stored in one or more repositories. A
+	 * snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT:
+	 * cat APIs are only intended for human consumption using the command line or
+	 * Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the get snapshot API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1364,12 +1394,11 @@ public final SnapshotsResponse snapshots(Function<SnapshotsRequest.Builder, Obje
 	}
 
 	/**
-	 * Get snapshot information Get information about the snapshots stored in one or
-	 * more repositories. A snapshot is a backup of an index or running
-	 * Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human
-	 * consumption using the command line or Kibana console. They are not intended
-	 * for use by applications. For application consumption, use the get snapshot
-	 * API.
+	 * Returns information about the snapshots stored in one or more repositories. A
+	 * snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT:
+	 * cat APIs are only intended for human consumption using the command line or
+	 * Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the get snapshot API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-snapshots.html">Documentation
@@ -1384,10 +1413,10 @@ public SnapshotsResponse snapshots() throws IOException, ElasticsearchException
 	// ----- Endpoint: cat.tasks
 
 	/**
-	 * Get task information. Get information about tasks currently running in the
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the task management API.
+	 * Returns information about tasks currently executing in the cluster.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the task management API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/tasks.html">Documentation
@@ -1402,10 +1431,10 @@ public TasksResponse tasks(TasksRequest request) throws IOException, Elasticsear
 	}
 
 	/**
-	 * Get task information. Get information about tasks currently running in the
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the task management API.
+	 * Returns information about tasks currently executing in the cluster.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the task management API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1421,10 +1450,10 @@ public final TasksResponse tasks(Function<TasksRequest.Builder, ObjectBuilder<Ta
 	}
 
 	/**
-	 * Get task information. Get information about tasks currently running in the
-	 * cluster. IMPORTANT: cat APIs are only intended for human consumption using
-	 * the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the task management API.
+	 * Returns information about tasks currently executing in the cluster.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the task management API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/tasks.html">Documentation
@@ -1439,12 +1468,11 @@ public TasksResponse tasks() throws IOException, ElasticsearchException {
 	// ----- Endpoint: cat.templates
 
 	/**
-	 * Get index template information. Get information about the index templates in
-	 * a cluster. You can use index templates to apply index settings and field
-	 * mappings to new indices at creation. IMPORTANT: cat APIs are only intended
-	 * for human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the get
-	 * index template API.
+	 * Returns information about index templates in a cluster. You can use index
+	 * templates to apply index settings and field mappings to new indices at
+	 * creation. IMPORTANT: cat APIs are only intended for human consumption using
+	 * the command line or Kibana console. They are not intended for use by
+	 * applications. For application consumption, use the get index template API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-templates.html">Documentation
@@ -1459,12 +1487,11 @@ public TemplatesResponse templates(TemplatesRequest request) throws IOException,
 	}
 
 	/**
-	 * Get index template information. Get information about the index templates in
-	 * a cluster. You can use index templates to apply index settings and field
-	 * mappings to new indices at creation. IMPORTANT: cat APIs are only intended
-	 * for human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the get
-	 * index template API.
+	 * Returns information about index templates in a cluster. You can use index
+	 * templates to apply index settings and field mappings to new indices at
+	 * creation. IMPORTANT: cat APIs are only intended for human consumption using
+	 * the command line or Kibana console. They are not intended for use by
+	 * applications. For application consumption, use the get index template API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1480,12 +1507,11 @@ public final TemplatesResponse templates(Function<TemplatesRequest.Builder, Obje
 	}
 
 	/**
-	 * Get index template information. Get information about the index templates in
-	 * a cluster. You can use index templates to apply index settings and field
-	 * mappings to new indices at creation. IMPORTANT: cat APIs are only intended
-	 * for human consumption using the command line or Kibana console. They are not
-	 * intended for use by applications. For application consumption, use the get
-	 * index template API.
+	 * Returns information about index templates in a cluster. You can use index
+	 * templates to apply index settings and field mappings to new indices at
+	 * creation. IMPORTANT: cat APIs are only intended for human consumption using
+	 * the command line or Kibana console. They are not intended for use by
+	 * applications. For application consumption, use the get index template API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-templates.html">Documentation
@@ -1500,11 +1526,11 @@ public TemplatesResponse templates() throws IOException, ElasticsearchException
 	// ----- Endpoint: cat.thread_pool
 
 	/**
-	 * Get thread pool statistics. Get thread pool statistics for each node in a
-	 * cluster. Returned information includes all built-in thread pools and custom
-	 * thread pools. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns thread pool statistics for each node in a cluster. Returned
+	 * information includes all built-in thread pools and custom thread pools.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-thread-pool.html">Documentation
@@ -1519,11 +1545,11 @@ public ThreadPoolResponse threadPool(ThreadPoolRequest request) throws IOExcepti
 	}
 
 	/**
-	 * Get thread pool statistics. Get thread pool statistics for each node in a
-	 * cluster. Returned information includes all built-in thread pools and custom
-	 * thread pools. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns thread pool statistics for each node in a cluster. Returned
+	 * information includes all built-in thread pools and custom thread pools.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the nodes info API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1539,11 +1565,11 @@ public final ThreadPoolResponse threadPool(Function<ThreadPoolRequest.Builder, O
 	}
 
 	/**
-	 * Get thread pool statistics. Get thread pool statistics for each node in a
-	 * cluster. Returned information includes all built-in thread pools and custom
-	 * thread pools. IMPORTANT: cat APIs are only intended for human consumption
-	 * using the command line or Kibana console. They are not intended for use by
-	 * applications. For application consumption, use the nodes info API.
+	 * Returns thread pool statistics for each node in a cluster. Returned
+	 * information includes all built-in thread pools and custom thread pools.
+	 * IMPORTANT: cat APIs are only intended for human consumption using the command
+	 * line or Kibana console. They are not intended for use by applications. For
+	 * application consumption, use the nodes info API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/8.17/cat-thread-pool.html">Documentation
@@ -1558,8 +1584,7 @@ public ThreadPoolResponse threadPool() throws IOException, ElasticsearchExceptio
 	// ----- Endpoint: cat.transforms
 
 	/**
-	 * Get transform information. Get configuration and usage information about
-	 * transforms.
+	 * Get transforms. Returns configuration and usage information about transforms.
 	 * <p>
 	 * CAT APIs are only intended for human consumption using the Kibana console or
 	 * command line. They are not intended for use by applications. For application
@@ -1578,8 +1603,7 @@ public TransformsResponse transforms(TransformsRequest request) throws IOExcepti
 	}
 
 	/**
-	 * Get transform information. Get configuration and usage information about
-	 * transforms.
+	 * Get transforms. Returns configuration and usage information about transforms.
 	 * <p>
 	 * CAT APIs are only intended for human consumption using the Kibana console or
 	 * command line. They are not intended for use by applications. For application
@@ -1599,8 +1623,7 @@ public final TransformsResponse transforms(Function<TransformsRequest.Builder, O
 	}
 
 	/**
-	 * Get transform information. Get configuration and usage information about
-	 * transforms.
+	 * Get transforms. Returns configuration and usage information about transforms.
 	 * <p>
 	 * CAT APIs are only intended for human consumption using the Kibana console or
 	 * command line. They are not intended for use by applications. For application
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java
index 7cbd6677f..ca611a8dd 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/FielddataRequest.java
@@ -57,11 +57,11 @@
 // typedef: cat.fielddata.Request
 
 /**
- * Get field data cache information. Get the amount of heap memory currently
- * used by the field data cache on every data node in the cluster. IMPORTANT:
- * cat APIs are only intended for human consumption using the command line or
- * Kibana console. They are not intended for use by applications. For
- * application consumption, use the nodes stats API.
+ * Returns the amount of heap memory currently used by the field data cache on
+ * every data node in the cluster. IMPORTANT: cat APIs are only intended for
+ * human consumption using the command line or Kibana console. They are not
+ * intended for use by applications. For application consumption, use the nodes
+ * stats API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.fielddata.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java
index a5849749a..14e470a02 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HealthRequest.java
@@ -55,18 +55,18 @@
 // typedef: cat.health.Request
 
 /**
- * Get the cluster health status. IMPORTANT: cat APIs are only intended for
- * human consumption using the command line or Kibana console. They are not
- * intended for use by applications. For application consumption, use the
- * cluster health API. This API is often used to check malfunctioning clusters.
- * To help you track cluster health alongside log files and alerting systems,
- * the API returns timestamps in two formats: <code>HH:MM:SS</code>, which is
- * human-readable but includes no date information;
- * <code>Unix epoch time</code>, which is machine-sortable and includes date
- * information. The latter format is useful for cluster recoveries that take
- * multiple days. You can use the cat health API to verify cluster health across
- * multiple nodes. You also can use the API to track the recovery of a large
- * cluster over a longer period of time.
+ * Returns the health status of a cluster, similar to the cluster health API.
+ * IMPORTANT: cat APIs are only intended for human consumption using the command
+ * line or Kibana console. They are not intended for use by applications. For
+ * application consumption, use the cluster health API. This API is often used
+ * to check malfunctioning clusters. To help you track cluster health alongside
+ * log files and alerting systems, the API returns timestamps in two formats:
+ * <code>HH:MM:SS</code>, which is human-readable but includes no date
+ * information; <code>Unix epoch time</code>, which is machine-sortable and
+ * includes date information. The latter format is useful for cluster recoveries
+ * that take multiple days. You can use the cat health API to verify cluster
+ * health across multiple nodes. You also can use the API to track the recovery
+ * of a large cluster over a longer period of time.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.health.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HelpRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HelpRequest.java
index 92567555f..78d0d996a 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HelpRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HelpRequest.java
@@ -29,8 +29,6 @@
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 
 //----------------------------------------------------------------
@@ -57,7 +55,7 @@
  *      specification</a>
  */
 
-public class HelpRequest extends CatRequestBase {
+public class HelpRequest {
 	public HelpRequest() {
 	}
 
@@ -93,9 +91,7 @@ public HelpRequest() {
 
 			// Request parameters
 			request -> {
-				Map<String, String> params = new HashMap<>();
-				params.put("format", "json");
-				return params;
+				return Collections.emptyMap();
 
 			}, SimpleEndpoint.emptyMap(), false, HelpResponse._DESERIALIZER);
 }
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HelpResponse.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HelpResponse.java
index 0edc100ee..03fced1f8 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HelpResponse.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/HelpResponse.java
@@ -19,23 +19,13 @@
 
 package co.elastic.clients.elasticsearch.cat;
 
-import co.elastic.clients.elasticsearch.cat.help.HelpRecord;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
-import co.elastic.clients.json.JsonpMapper;
-import co.elastic.clients.json.JsonpSerializable;
-import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
-import co.elastic.clients.util.ApiTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
-import co.elastic.clients.util.WithJsonObjectBuilderBase;
 import jakarta.json.stream.JsonGenerator;
-import jakarta.json.stream.JsonParser;
-import java.util.List;
 import java.util.Objects;
-import java.util.function.Function;
-import javax.annotation.Nullable;
 
 //----------------------------------------------------------------
 //       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
@@ -59,120 +49,17 @@
  * @see <a href="../doc-files/api-spec.html#cat.help.Response">API
  *      specification</a>
  */
-@JsonpDeserializable
-public class HelpResponse implements JsonpSerializable {
-	private final List<HelpRecord> valueBody;
 
-	// ---------------------------------------------------------------------------------------------
-
-	private HelpResponse(Builder builder) {
-
-		this.valueBody = ApiTypeHelper.unmodifiableRequired(builder.valueBody, this, "valueBody");
-
-	}
-
-	public static HelpResponse of(Function<Builder, ObjectBuilder<HelpResponse>> fn) {
-		return fn.apply(new Builder()).build();
-	}
-
-	/**
-	 * Required - Response value.
-	 */
-	public final List<HelpRecord> valueBody() {
-		return this.valueBody;
+public class HelpResponse {
+	public HelpResponse() {
 	}
 
 	/**
-	 * Serialize this value to JSON.
+	 * Singleton instance for {@link HelpResponse}.
 	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartArray();
-		for (HelpRecord item0 : this.valueBody) {
-			item0.serialize(generator, mapper);
-
-		}
-		generator.writeEnd();
-
-	}
+	public static final HelpResponse _INSTANCE = new HelpResponse();
 
-	@Override
-	public String toString() {
-		return JsonpUtils.toString(this);
-	}
-
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link HelpResponse}.
-	 */
-
-	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<HelpResponse> {
-		private List<HelpRecord> valueBody;
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * Adds all elements of <code>list</code> to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(List<HelpRecord> list) {
-			this.valueBody = _listAddAll(this.valueBody, list);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * Adds one or more values to <code>valueBody</code>.
-		 */
-		public final Builder valueBody(HelpRecord value, HelpRecord... values) {
-			this.valueBody = _listAdd(this.valueBody, value, values);
-			return this;
-		}
-
-		/**
-		 * Required - Response value.
-		 * <p>
-		 * Adds a value to <code>valueBody</code> using a builder lambda.
-		 */
-		public final Builder valueBody(Function<HelpRecord.Builder, ObjectBuilder<HelpRecord>> fn) {
-			return valueBody(fn.apply(new HelpRecord.Builder()).build());
-		}
-
-		@Override
-		public Builder withJson(JsonParser parser, JsonpMapper mapper) {
-
-			@SuppressWarnings("unchecked")
-			List<HelpRecord> value = (List<HelpRecord>) JsonpDeserializer.arrayDeserializer(HelpRecord._DESERIALIZER)
-					.deserialize(parser, mapper);
-			return this.valueBody(value);
-		}
-
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link HelpResponse}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public HelpResponse build() {
-			_checkSingleUse();
-
-			return new HelpResponse(this);
-		}
-	}
-
-	public static final JsonpDeserializer<HelpResponse> _DESERIALIZER = createHelpResponseDeserializer();
-	protected static JsonpDeserializer<HelpResponse> createHelpResponseDeserializer() {
-
-		JsonpDeserializer<List<HelpRecord>> valueDeserializer = JsonpDeserializer
-				.arrayDeserializer(HelpRecord._DESERIALIZER);
-
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper, event) -> new Builder()
-				.valueBody(valueDeserializer.deserialize(parser, mapper, event)).build());
-	}
+	public static final JsonpDeserializer<HelpResponse> _DESERIALIZER = JsonpDeserializer
+			.emptyObject(HelpResponse._INSTANCE);
 
 }
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java
index af07f14e5..794b548b5 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/IndicesRequest.java
@@ -23,6 +23,7 @@
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
 import co.elastic.clients.elasticsearch._types.ExpandWildcard;
 import co.elastic.clients.elasticsearch._types.HealthStatus;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
@@ -101,6 +102,9 @@ public class IndicesRequest extends CatRequestBase {
 
 	private final List<String> index;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	@Nullable
 	private final Boolean pri;
 
@@ -116,6 +120,7 @@ private IndicesRequest(Builder builder) {
 		this.health = builder.health;
 		this.includeUnloadedSegments = builder.includeUnloadedSegments;
 		this.index = ApiTypeHelper.unmodifiable(builder.index);
+		this.masterTimeout = builder.masterTimeout;
 		this.pri = builder.pri;
 		this.time = builder.time;
 
@@ -177,6 +182,16 @@ public final List<String> index() {
 		return this.index;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	/**
 	 * If true, the response only includes information from primary shards.
 	 * <p>
@@ -221,6 +236,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private List<String> index;
 
+		@Nullable
+		private Time masterTimeout;
+
 		@Nullable
 		private Boolean pri;
 
@@ -311,6 +329,25 @@ public final Builder index(String value, String... values) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		/**
 		 * If true, the response only includes information from primary shards.
 		 * <p>
@@ -412,6 +449,9 @@ public IndicesRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
 					params.put("expand_wildcards",
 							request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java
index a9cc80187..d1af00023 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MasterRequest.java
@@ -20,6 +20,7 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -54,11 +55,10 @@
 // typedef: cat.master.Request
 
 /**
- * Get master node information. Get information about the master node, including
- * the ID, bound IP address, and name. IMPORTANT: cat APIs are only intended for
- * human consumption using the command line or Kibana console. They are not
- * intended for use by applications. For application consumption, use the nodes
- * info API.
+ * Returns information about the master node, including the ID, bound IP
+ * address, and name. IMPORTANT: cat APIs are only intended for human
+ * consumption using the command line or Kibana console. They are not intended
+ * for use by applications. For application consumption, use the nodes info API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.master.Request">API
  *      specification</a>
@@ -68,11 +68,15 @@ public class MasterRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private MasterRequest(Builder builder) {
 
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 
 	}
 
@@ -94,6 +98,16 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -106,6 +120,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
 		/**
 		 * If <code>true</code>, the request computes the list of selected nodes from
 		 * the local cluster state. If <code>false</code> the list of selected nodes are
@@ -120,6 +137,25 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -167,6 +203,9 @@ public MasterRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.local != null) {
 					params.put("local", String.valueOf(request.local));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java
index c257917f4..2457f9c21 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlDataFrameAnalyticsRequest.java
@@ -21,7 +21,7 @@
 
 import co.elastic.clients.elasticsearch._types.Bytes;
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
-import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -86,7 +86,7 @@ public class MlDataFrameAnalyticsRequest extends CatRequestBase {
 	private final List<CatDfaColumn> s;
 
 	@Nullable
-	private final Time time;
+	private final TimeUnit time;
 
 	// ---------------------------------------------------------------------------------------------
 
@@ -161,7 +161,7 @@ public final List<CatDfaColumn> s() {
 	 * API name: {@code time}
 	 */
 	@Nullable
-	public final Time time() {
+	public final TimeUnit time() {
 		return this.time;
 	}
 
@@ -190,7 +190,7 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		private List<CatDfaColumn> s;
 
 		@Nullable
-		private Time time;
+		private TimeUnit time;
 
 		/**
 		 * Whether to ignore if a wildcard expression matches no configs. (This includes
@@ -278,20 +278,11 @@ public final Builder s(CatDfaColumn value, CatDfaColumn... values) {
 		 * <p>
 		 * API name: {@code time}
 		 */
-		public final Builder time(@Nullable Time value) {
+		public final Builder time(@Nullable TimeUnit value) {
 			this.time = value;
 			return this;
 		}
 
-		/**
-		 * Unit used to display time values.
-		 * <p>
-		 * API name: {@code time}
-		 */
-		public final Builder time(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.time(fn.apply(new Time.Builder()).build());
-		}
-
 		@Override
 		protected Builder self() {
 			return this;
@@ -387,7 +378,7 @@ public MlDataFrameAnalyticsRequest build() {
 					params.put("h", request.h.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
 				}
 				if (request.time != null) {
-					params.put("time", request.time._toJsonString());
+					params.put("time", request.time.jsonValue());
 				}
 				if (request.allowNoMatch != null) {
 					params.put("allow_no_match", String.valueOf(request.allowNoMatch));
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlTrainedModelsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlTrainedModelsRequest.java
index fe3bc8011..b5beb9f66 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlTrainedModelsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/MlTrainedModelsRequest.java
@@ -21,6 +21,7 @@
 
 import co.elastic.clients.elasticsearch._types.Bytes;
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -90,6 +91,9 @@ public class MlTrainedModelsRequest extends CatRequestBase {
 	@Nullable
 	private final Integer size;
 
+	@Nullable
+	private final TimeUnit time;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private MlTrainedModelsRequest(Builder builder) {
@@ -101,6 +105,7 @@ private MlTrainedModelsRequest(Builder builder) {
 		this.modelId = builder.modelId;
 		this.s = ApiTypeHelper.unmodifiable(builder.s);
 		this.size = builder.size;
+		this.time = builder.time;
 
 	}
 
@@ -182,6 +187,16 @@ public final Integer size() {
 		return this.size;
 	}
 
+	/**
+	 * Unit used to display time values.
+	 * <p>
+	 * API name: {@code time}
+	 */
+	@Nullable
+	public final TimeUnit time() {
+		return this.time;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -212,6 +227,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Integer size;
 
+		@Nullable
+		private TimeUnit time;
+
 		/**
 		 * Specifies what to do when the request: contains wildcard expressions and
 		 * there are no models that match; contains the <code>_all</code> string or no
@@ -316,6 +334,16 @@ public final Builder size(@Nullable Integer value) {
 			return this;
 		}
 
+		/**
+		 * Unit used to display time values.
+		 * <p>
+		 * API name: {@code time}
+		 */
+		public final Builder time(@Nullable TimeUnit value) {
+			this.time = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -414,6 +442,9 @@ public MlTrainedModelsRequest build() {
 				if (request.from != null) {
 					params.put("from", String.valueOf(request.from));
 				}
+				if (request.time != null) {
+					params.put("time", request.time.jsonValue());
+				}
 				if (request.allowNoMatch != null) {
 					params.put("allow_no_match", String.valueOf(request.allowNoMatch));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodeattrsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodeattrsRequest.java
index d97911919..45ba620ce 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodeattrsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodeattrsRequest.java
@@ -20,6 +20,7 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -54,10 +55,10 @@
 // typedef: cat.nodeattrs.Request
 
 /**
- * Get node attribute information. Get information about custom node attributes.
- * IMPORTANT: cat APIs are only intended for human consumption using the command
- * line or Kibana console. They are not intended for use by applications. For
- * application consumption, use the nodes info API.
+ * Returns information about custom node attributes. IMPORTANT: cat APIs are
+ * only intended for human consumption using the command line or Kibana console.
+ * They are not intended for use by applications. For application consumption,
+ * use the nodes info API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.nodeattrs.Request">API
  *      specification</a>
@@ -67,11 +68,15 @@ public class NodeattrsRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private NodeattrsRequest(Builder builder) {
 
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 
 	}
 
@@ -93,6 +98,16 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -105,6 +120,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
 		/**
 		 * If <code>true</code>, the request computes the list of selected nodes from
 		 * the local cluster state. If <code>false</code> the list of selected nodes are
@@ -119,6 +137,25 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -166,6 +203,9 @@ public NodeattrsRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.local != null) {
 					params.put("local", String.valueOf(request.local));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodesRequest.java
index 8fea93dc6..e4dab0590 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodesRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/NodesRequest.java
@@ -21,6 +21,8 @@
 
 import co.elastic.clients.elasticsearch._types.Bytes;
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -55,10 +57,10 @@
 // typedef: cat.nodes.Request
 
 /**
- * Get node information. Get information about the nodes in a cluster.
- * IMPORTANT: cat APIs are only intended for human consumption using the command
- * line or Kibana console. They are not intended for use by applications. For
- * application consumption, use the nodes info API.
+ * Returns information about the nodes in a cluster. IMPORTANT: cat APIs are
+ * only intended for human consumption using the command line or Kibana console.
+ * They are not intended for use by applications. For application consumption,
+ * use the nodes info API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.nodes.Request">API
  *      specification</a>
@@ -74,6 +76,12 @@ public class NodesRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean includeUnloadedSegments;
 
+	@Nullable
+	private final Time masterTimeout;
+
+	@Nullable
+	private final TimeUnit time;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private NodesRequest(Builder builder) {
@@ -81,6 +89,8 @@ private NodesRequest(Builder builder) {
 		this.bytes = builder.bytes;
 		this.fullId = builder.fullId;
 		this.includeUnloadedSegments = builder.includeUnloadedSegments;
+		this.masterTimeout = builder.masterTimeout;
+		this.time = builder.time;
 
 	}
 
@@ -120,6 +130,26 @@ public final Boolean includeUnloadedSegments() {
 		return this.includeUnloadedSegments;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
+	/**
+	 * Unit used to display time values.
+	 * <p>
+	 * API name: {@code time}
+	 */
+	@Nullable
+	public final TimeUnit time() {
+		return this.time;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -136,6 +166,12 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder> impl
 		@Nullable
 		private Boolean includeUnloadedSegments;
 
+		@Nullable
+		private Time masterTimeout;
+
+		@Nullable
+		private TimeUnit time;
+
 		/**
 		 * The unit used to display byte values.
 		 * <p>
@@ -168,6 +204,35 @@ public final Builder includeUnloadedSegments(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * Unit used to display time values.
+		 * <p>
+		 * API name: {@code time}
+		 */
+		public final Builder time(@Nullable TimeUnit value) {
+			this.time = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -215,12 +280,18 @@ public NodesRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.bytes != null) {
 					params.put("bytes", request.bytes.jsonValue());
 				}
 				if (request.includeUnloadedSegments != null) {
 					params.put("include_unloaded_segments", String.valueOf(request.includeUnloadedSegments));
 				}
+				if (request.time != null) {
+					params.put("time", request.time.jsonValue());
+				}
 				if (request.fullId != null) {
 					params.put("full_id", String.valueOf(request.fullId));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PendingTasksRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PendingTasksRequest.java
index 3f08d5276..c16b5f0a3 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PendingTasksRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PendingTasksRequest.java
@@ -20,6 +20,8 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -54,11 +56,10 @@
 // typedef: cat.pending_tasks.Request
 
 /**
- * Get pending task information. Get information about cluster-level changes
- * that have not yet taken effect. IMPORTANT: cat APIs are only intended for
- * human consumption using the command line or Kibana console. They are not
- * intended for use by applications. For application consumption, use the
- * pending cluster tasks API.
+ * Returns cluster-level changes that have not yet been executed. IMPORTANT: cat
+ * APIs are only intended for human consumption using the command line or Kibana
+ * console. They are not intended for use by applications. For application
+ * consumption, use the pending cluster tasks API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.pending_tasks.Request">API
  *      specification</a>
@@ -68,11 +69,19 @@ public class PendingTasksRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
+	@Nullable
+	private final TimeUnit time;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private PendingTasksRequest(Builder builder) {
 
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
+		this.time = builder.time;
 
 	}
 
@@ -94,6 +103,26 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
+	/**
+	 * Unit used to display time values.
+	 * <p>
+	 * API name: {@code time}
+	 */
+	@Nullable
+	public final TimeUnit time() {
+		return this.time;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -106,6 +135,12 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
+		@Nullable
+		private TimeUnit time;
+
 		/**
 		 * If <code>true</code>, the request computes the list of selected nodes from
 		 * the local cluster state. If <code>false</code> the list of selected nodes are
@@ -120,6 +155,35 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * Unit used to display time values.
+		 * <p>
+		 * API name: {@code time}
+		 */
+		public final Builder time(@Nullable TimeUnit value) {
+			this.time = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -167,6 +231,12 @@ public PendingTasksRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
+				if (request.time != null) {
+					params.put("time", request.time.jsonValue());
+				}
 				if (request.local != null) {
 					params.put("local", String.valueOf(request.local));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PluginsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PluginsRequest.java
index 1487f4cf1..478c854dd 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PluginsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/PluginsRequest.java
@@ -20,6 +20,7 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -54,24 +55,32 @@
 // typedef: cat.plugins.Request
 
 /**
- * Get plugin information. Get a list of plugins running on each node of a
- * cluster. IMPORTANT: cat APIs are only intended for human consumption using
- * the command line or Kibana console. They are not intended for use by
- * applications. For application consumption, use the nodes info API.
+ * Returns a list of plugins running on each node of a cluster. IMPORTANT: cat
+ * APIs are only intended for human consumption using the command line or Kibana
+ * console. They are not intended for use by applications. For application
+ * consumption, use the nodes info API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.plugins.Request">API
  *      specification</a>
  */
 
 public class PluginsRequest extends CatRequestBase {
+	@Nullable
+	private final Boolean includeBootstrap;
+
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private PluginsRequest(Builder builder) {
 
+		this.includeBootstrap = builder.includeBootstrap;
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 
 	}
 
@@ -79,6 +88,16 @@ public static PluginsRequest of(Function<Builder, ObjectBuilder<PluginsRequest>>
 		return fn.apply(new Builder()).build();
 	}
 
+	/**
+	 * Include bootstrap plugins in the response
+	 * <p>
+	 * API name: {@code include_bootstrap}
+	 */
+	@Nullable
+	public final Boolean includeBootstrap() {
+		return this.includeBootstrap;
+	}
+
 	/**
 	 * If <code>true</code>, the request computes the list of selected nodes from
 	 * the local cluster state. If <code>false</code> the list of selected nodes are
@@ -93,6 +112,16 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -102,9 +131,25 @@ public final Boolean local() {
 	public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 			implements
 				ObjectBuilder<PluginsRequest> {
+		@Nullable
+		private Boolean includeBootstrap;
+
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
+		/**
+		 * Include bootstrap plugins in the response
+		 * <p>
+		 * API name: {@code include_bootstrap}
+		 */
+		public final Builder includeBootstrap(@Nullable Boolean value) {
+			this.includeBootstrap = value;
+			return this;
+		}
+
 		/**
 		 * If <code>true</code>, the request computes the list of selected nodes from
 		 * the local cluster state. If <code>false</code> the list of selected nodes are
@@ -119,6 +164,25 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -166,6 +230,12 @@ public PluginsRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
+				if (request.includeBootstrap != null) {
+					params.put("include_bootstrap", String.valueOf(request.includeBootstrap));
+				}
 				if (request.local != null) {
 					params.put("local", String.valueOf(request.local));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RecoveryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RecoveryRequest.java
index 37e01d4c0..fdd22af97 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RecoveryRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RecoveryRequest.java
@@ -21,6 +21,7 @@
 
 import co.elastic.clients.elasticsearch._types.Bytes;
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -58,15 +59,15 @@
 // typedef: cat.recovery.Request
 
 /**
- * Get shard recovery information. Get information about ongoing and completed
- * shard recoveries. Shard recovery is the process of initializing a shard copy,
- * such as restoring a primary shard from a snapshot or syncing a replica shard
- * from a primary shard. When a shard recovery completes, the recovered shard is
- * available for search and indexing. For data streams, the API returns
- * information about the stream’s backing indices. IMPORTANT: cat APIs are only
- * intended for human consumption using the command line or Kibana console. They
- * are not intended for use by applications. For application consumption, use
- * the index recovery API.
+ * Returns information about ongoing and completed shard recoveries. Shard
+ * recovery is the process of initializing a shard copy, such as restoring a
+ * primary shard from a snapshot or syncing a replica shard from a primary
+ * shard. When a shard recovery completes, the recovered shard is available for
+ * search and indexing. For data streams, the API returns information about the
+ * stream’s backing indices. IMPORTANT: cat APIs are only intended for human
+ * consumption using the command line or Kibana console. They are not intended
+ * for use by applications. For application consumption, use the index recovery
+ * API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.recovery.Request">API
  *      specification</a>
@@ -84,6 +85,9 @@ public class RecoveryRequest extends CatRequestBase {
 
 	private final List<String> index;
 
+	@Nullable
+	private final TimeUnit time;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private RecoveryRequest(Builder builder) {
@@ -92,6 +96,7 @@ private RecoveryRequest(Builder builder) {
 		this.bytes = builder.bytes;
 		this.detailed = builder.detailed;
 		this.index = ApiTypeHelper.unmodifiable(builder.index);
+		this.time = builder.time;
 
 	}
 
@@ -141,6 +146,16 @@ public final List<String> index() {
 		return this.index;
 	}
 
+	/**
+	 * Unit used to display time values.
+	 * <p>
+	 * API name: {@code time}
+	 */
+	@Nullable
+	public final TimeUnit time() {
+		return this.time;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -162,6 +177,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private List<String> index;
 
+		@Nullable
+		private TimeUnit time;
+
 		/**
 		 * If <code>true</code>, the response only includes ongoing shard recoveries.
 		 * <p>
@@ -221,6 +239,16 @@ public final Builder index(String value, String... values) {
 			return this;
 		}
 
+		/**
+		 * Unit used to display time values.
+		 * <p>
+		 * API name: {@code time}
+		 */
+		public final Builder time(@Nullable TimeUnit value) {
+			this.time = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -311,6 +339,9 @@ public RecoveryRequest build() {
 				if (request.bytes != null) {
 					params.put("bytes", request.bytes.jsonValue());
 				}
+				if (request.time != null) {
+					params.put("time", request.time.jsonValue());
+				}
 				return params;
 
 			}, SimpleEndpoint.emptyMap(), false, RecoveryResponse._DESERIALIZER);
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RepositoriesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RepositoriesRequest.java
index 99f6cd8f7..207b8b7f5 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RepositoriesRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/RepositoriesRequest.java
@@ -20,6 +20,7 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -28,10 +29,13 @@
 import co.elastic.clients.transport.endpoints.SimpleEndpoint;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
+import java.lang.Boolean;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
+import javax.annotation.Nullable;
 
 //----------------------------------------------------------------
 //       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
@@ -51,24 +55,124 @@
 // typedef: cat.repositories.Request
 
 /**
- * Get snapshot repository information. Get a list of snapshot repositories for
- * a cluster. IMPORTANT: cat APIs are only intended for human consumption using
- * the command line or Kibana console. They are not intended for use by
- * applications. For application consumption, use the get snapshot repository
- * API.
+ * Returns the snapshot repositories for a cluster. IMPORTANT: cat APIs are only
+ * intended for human consumption using the command line or Kibana console. They
+ * are not intended for use by applications. For application consumption, use
+ * the get snapshot repository API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.repositories.Request">API
  *      specification</a>
  */
 
 public class RepositoriesRequest extends CatRequestBase {
-	public RepositoriesRequest() {
+	@Nullable
+	private final Boolean local;
+
+	@Nullable
+	private final Time masterTimeout;
+
+	// ---------------------------------------------------------------------------------------------
+
+	private RepositoriesRequest(Builder builder) {
+
+		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
+
+	}
+
+	public static RepositoriesRequest of(Function<Builder, ObjectBuilder<RepositoriesRequest>> fn) {
+		return fn.apply(new Builder()).build();
+	}
+
+	/**
+	 * If <code>true</code>, the request computes the list of selected nodes from
+	 * the local cluster state. If <code>false</code> the list of selected nodes are
+	 * computed from the cluster state of the master node. In both cases the
+	 * coordinating node will send requests for further information to each selected
+	 * node.
+	 * <p>
+	 * API name: {@code local}
+	 */
+	@Nullable
+	public final Boolean local() {
+		return this.local;
+	}
+
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
 	}
 
+	// ---------------------------------------------------------------------------------------------
+
 	/**
-	 * Singleton instance for {@link RepositoriesRequest}.
+	 * Builder for {@link RepositoriesRequest}.
 	 */
-	public static final RepositoriesRequest _INSTANCE = new RepositoriesRequest();
+
+	public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
+			implements
+				ObjectBuilder<RepositoriesRequest> {
+		@Nullable
+		private Boolean local;
+
+		@Nullable
+		private Time masterTimeout;
+
+		/**
+		 * If <code>true</code>, the request computes the list of selected nodes from
+		 * the local cluster state. If <code>false</code> the list of selected nodes are
+		 * computed from the cluster state of the master node. In both cases the
+		 * coordinating node will send requests for further information to each selected
+		 * node.
+		 * <p>
+		 * API name: {@code local}
+		 */
+		public final Builder local(@Nullable Boolean value) {
+			this.local = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
+		@Override
+		protected Builder self() {
+			return this;
+		}
+
+		/**
+		 * Builds a {@link RepositoriesRequest}.
+		 *
+		 * @throws NullPointerException
+		 *             if some of the required fields are null.
+		 */
+		public RepositoriesRequest build() {
+			_checkSingleUse();
+
+			return new RepositoriesRequest(this);
+		}
+	}
 
 	// ---------------------------------------------------------------------------------------------
 
@@ -99,6 +203,12 @@ public RepositoriesRequest() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
+				if (request.local != null) {
+					params.put("local", String.valueOf(request.local));
+				}
 				return params;
 
 			}, SimpleEndpoint.emptyMap(), false, RepositoriesResponse._DESERIALIZER);
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SegmentsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SegmentsRequest.java
index b5199379e..11e8b65b0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SegmentsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SegmentsRequest.java
@@ -21,6 +21,7 @@
 
 import co.elastic.clients.elasticsearch._types.Bytes;
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -58,11 +59,11 @@
 // typedef: cat.segments.Request
 
 /**
- * Get segment information. Get low-level information about the Lucene segments
- * in index shards. For data streams, the API returns information about the
- * backing indices. IMPORTANT: cat APIs are only intended for human consumption
- * using the command line or Kibana console. They are not intended for use by
- * applications. For application consumption, use the index segments API.
+ * Returns low-level information about the Lucene segments in index shards. For
+ * data streams, the API returns information about the backing indices.
+ * IMPORTANT: cat APIs are only intended for human consumption using the command
+ * line or Kibana console. They are not intended for use by applications. For
+ * application consumption, use the index segments API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.segments.Request">API
  *      specification</a>
@@ -77,6 +78,9 @@ public class SegmentsRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private SegmentsRequest(Builder builder) {
@@ -84,6 +88,7 @@ private SegmentsRequest(Builder builder) {
 		this.bytes = builder.bytes;
 		this.index = ApiTypeHelper.unmodifiable(builder.index);
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 
 	}
 
@@ -126,6 +131,16 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -144,6 +159,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
 		/**
 		 * The unit used to display byte values.
 		 * <p>
@@ -196,6 +214,25 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -277,6 +314,9 @@ public SegmentsRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.bytes != null) {
 					params.put("bytes", request.bytes.jsonValue());
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ShardsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ShardsRequest.java
index 8ce91892d..3ed656e14 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ShardsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ShardsRequest.java
@@ -21,6 +21,8 @@
 
 import co.elastic.clients.elasticsearch._types.Bytes;
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -57,10 +59,10 @@
 // typedef: cat.shards.Request
 
 /**
- * Get shard information. Get information about the shards in a cluster. For
- * data streams, the API returns information about the backing indices.
- * IMPORTANT: cat APIs are only intended for human consumption using the command
- * line or Kibana console. They are not intended for use by applications.
+ * Returns information about the shards in a cluster. For data streams, the API
+ * returns information about the backing indices. IMPORTANT: cat APIs are only
+ * intended for human consumption using the command line or Kibana console. They
+ * are not intended for use by applications.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.shards.Request">API
  *      specification</a>
@@ -72,12 +74,20 @@ public class ShardsRequest extends CatRequestBase {
 
 	private final List<String> index;
 
+	@Nullable
+	private final Time masterTimeout;
+
+	@Nullable
+	private final TimeUnit time;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private ShardsRequest(Builder builder) {
 
 		this.bytes = builder.bytes;
 		this.index = ApiTypeHelper.unmodifiable(builder.index);
+		this.masterTimeout = builder.masterTimeout;
+		this.time = builder.time;
 
 	}
 
@@ -106,6 +116,26 @@ public final List<String> index() {
 		return this.index;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
+	/**
+	 * Unit used to display time values.
+	 * <p>
+	 * API name: {@code time}
+	 */
+	@Nullable
+	public final TimeUnit time() {
+		return this.time;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -121,6 +151,12 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private List<String> index;
 
+		@Nullable
+		private Time masterTimeout;
+
+		@Nullable
+		private TimeUnit time;
+
 		/**
 		 * The unit used to display byte values.
 		 * <p>
@@ -159,6 +195,35 @@ public final Builder index(String value, String... values) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * Unit used to display time values.
+		 * <p>
+		 * API name: {@code time}
+		 */
+		public final Builder time(@Nullable TimeUnit value) {
+			this.time = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -240,9 +305,15 @@ public ShardsRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.bytes != null) {
 					params.put("bytes", request.bytes.jsonValue());
 				}
+				if (request.time != null) {
+					params.put("time", request.time.jsonValue());
+				}
 				return params;
 
 			}, SimpleEndpoint.emptyMap(), false, ShardsResponse._DESERIALIZER);
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SnapshotsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SnapshotsRequest.java
index 1e30a07c4..95749e3f2 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SnapshotsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/SnapshotsRequest.java
@@ -20,6 +20,8 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -57,12 +59,11 @@
 // typedef: cat.snapshots.Request
 
 /**
- * Get snapshot information Get information about the snapshots stored in one or
- * more repositories. A snapshot is a backup of an index or running
- * Elasticsearch cluster. IMPORTANT: cat APIs are only intended for human
- * consumption using the command line or Kibana console. They are not intended
- * for use by applications. For application consumption, use the get snapshot
- * API.
+ * Returns information about the snapshots stored in one or more repositories. A
+ * snapshot is a backup of an index or running Elasticsearch cluster. IMPORTANT:
+ * cat APIs are only intended for human consumption using the command line or
+ * Kibana console. They are not intended for use by applications. For
+ * application consumption, use the get snapshot API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.snapshots.Request">API
  *      specification</a>
@@ -72,14 +73,22 @@ public class SnapshotsRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean ignoreUnavailable;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	private final List<String> repository;
 
+	@Nullable
+	private final TimeUnit time;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private SnapshotsRequest(Builder builder) {
 
 		this.ignoreUnavailable = builder.ignoreUnavailable;
+		this.masterTimeout = builder.masterTimeout;
 		this.repository = ApiTypeHelper.unmodifiable(builder.repository);
+		this.time = builder.time;
 
 	}
 
@@ -98,6 +107,16 @@ public final Boolean ignoreUnavailable() {
 		return this.ignoreUnavailable;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	/**
 	 * A comma-separated list of snapshot repositories used to limit the request.
 	 * Accepts wildcard expressions. <code>_all</code> returns all repositories. If
@@ -109,6 +128,16 @@ public final List<String> repository() {
 		return this.repository;
 	}
 
+	/**
+	 * Unit used to display time values.
+	 * <p>
+	 * API name: {@code time}
+	 */
+	@Nullable
+	public final TimeUnit time() {
+		return this.time;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -121,9 +150,15 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean ignoreUnavailable;
 
+		@Nullable
+		private Time masterTimeout;
+
 		@Nullable
 		private List<String> repository;
 
+		@Nullable
+		private TimeUnit time;
+
 		/**
 		 * If <code>true</code>, the response does not include information from
 		 * unavailable snapshots.
@@ -135,6 +170,25 @@ public final Builder ignoreUnavailable(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		/**
 		 * A comma-separated list of snapshot repositories used to limit the request.
 		 * Accepts wildcard expressions. <code>_all</code> returns all repositories. If
@@ -163,6 +217,16 @@ public final Builder repository(String value, String... values) {
 			return this;
 		}
 
+		/**
+		 * Unit used to display time values.
+		 * <p>
+		 * API name: {@code time}
+		 */
+		public final Builder time(@Nullable TimeUnit value) {
+			this.time = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -245,9 +309,15 @@ public SnapshotsRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.ignoreUnavailable != null) {
 					params.put("ignore_unavailable", String.valueOf(request.ignoreUnavailable));
 				}
+				if (request.time != null) {
+					params.put("time", request.time.jsonValue());
+				}
 				return params;
 
 			}, SimpleEndpoint.emptyMap(), false, SnapshotsResponse._DESERIALIZER);
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TasksRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TasksRequest.java
index 7abeec6e1..592b5fcd4 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TasksRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TasksRequest.java
@@ -20,6 +20,8 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -58,10 +60,10 @@
 // typedef: cat.tasks.Request
 
 /**
- * Get task information. Get information about tasks currently running in the
- * cluster. IMPORTANT: cat APIs are only intended for human consumption using
- * the command line or Kibana console. They are not intended for use by
- * applications. For application consumption, use the task management API.
+ * Returns information about tasks currently executing in the cluster.
+ * IMPORTANT: cat APIs are only intended for human consumption using the command
+ * line or Kibana console. They are not intended for use by applications. For
+ * application consumption, use the task management API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.tasks.Request">API
  *      specification</a>
@@ -73,19 +75,31 @@ public class TasksRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean detailed;
 
-	private final List<String> nodeId;
+	private final List<String> nodes;
 
 	@Nullable
 	private final String parentTaskId;
 
+	@Nullable
+	private final TimeUnit time;
+
+	@Nullable
+	private final Time timeout;
+
+	@Nullable
+	private final Boolean waitForCompletion;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private TasksRequest(Builder builder) {
 
 		this.actions = ApiTypeHelper.unmodifiable(builder.actions);
 		this.detailed = builder.detailed;
-		this.nodeId = ApiTypeHelper.unmodifiable(builder.nodeId);
+		this.nodes = ApiTypeHelper.unmodifiable(builder.nodes);
 		this.parentTaskId = builder.parentTaskId;
+		this.time = builder.time;
+		this.timeout = builder.timeout;
+		this.waitForCompletion = builder.waitForCompletion;
 
 	}
 
@@ -116,10 +130,10 @@ public final Boolean detailed() {
 	/**
 	 * Unique node identifiers, which are used to limit the response.
 	 * <p>
-	 * API name: {@code node_id}
+	 * API name: {@code nodes}
 	 */
-	public final List<String> nodeId() {
-		return this.nodeId;
+	public final List<String> nodes() {
+		return this.nodes;
 	}
 
 	/**
@@ -132,6 +146,37 @@ public final String parentTaskId() {
 		return this.parentTaskId;
 	}
 
+	/**
+	 * Unit used to display time values.
+	 * <p>
+	 * API name: {@code time}
+	 */
+	@Nullable
+	public final TimeUnit time() {
+		return this.time;
+	}
+
+	/**
+	 * Period to wait for a response. If no response is received before the timeout
+	 * expires, the request fails and returns an error.
+	 * <p>
+	 * API name: {@code timeout}
+	 */
+	@Nullable
+	public final Time timeout() {
+		return this.timeout;
+	}
+
+	/**
+	 * If <code>true</code>, the request blocks until the task has completed.
+	 * <p>
+	 * API name: {@code wait_for_completion}
+	 */
+	@Nullable
+	public final Boolean waitForCompletion() {
+		return this.waitForCompletion;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -146,11 +191,20 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder> impl
 		private Boolean detailed;
 
 		@Nullable
-		private List<String> nodeId;
+		private List<String> nodes;
 
 		@Nullable
 		private String parentTaskId;
 
+		@Nullable
+		private TimeUnit time;
+
+		@Nullable
+		private Time timeout;
+
+		@Nullable
+		private Boolean waitForCompletion;
+
 		/**
 		 * The task action names, which are used to limit the response.
 		 * <p>
@@ -189,24 +243,24 @@ public final Builder detailed(@Nullable Boolean value) {
 		/**
 		 * Unique node identifiers, which are used to limit the response.
 		 * <p>
-		 * API name: {@code node_id}
+		 * API name: {@code nodes}
 		 * <p>
-		 * Adds all elements of <code>list</code> to <code>nodeId</code>.
+		 * Adds all elements of <code>list</code> to <code>nodes</code>.
 		 */
-		public final Builder nodeId(List<String> list) {
-			this.nodeId = _listAddAll(this.nodeId, list);
+		public final Builder nodes(List<String> list) {
+			this.nodes = _listAddAll(this.nodes, list);
 			return this;
 		}
 
 		/**
 		 * Unique node identifiers, which are used to limit the response.
 		 * <p>
-		 * API name: {@code node_id}
+		 * API name: {@code nodes}
 		 * <p>
-		 * Adds one or more values to <code>nodeId</code>.
+		 * Adds one or more values to <code>nodes</code>.
 		 */
-		public final Builder nodeId(String value, String... values) {
-			this.nodeId = _listAdd(this.nodeId, value, values);
+		public final Builder nodes(String value, String... values) {
+			this.nodes = _listAdd(this.nodes, value, values);
 			return this;
 		}
 
@@ -220,6 +274,47 @@ public final Builder parentTaskId(@Nullable String value) {
 			return this;
 		}
 
+		/**
+		 * Unit used to display time values.
+		 * <p>
+		 * API name: {@code time}
+		 */
+		public final Builder time(@Nullable TimeUnit value) {
+			this.time = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a response. If no response is received before the timeout
+		 * expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code timeout}
+		 */
+		public final Builder timeout(@Nullable Time value) {
+			this.timeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a response. If no response is received before the timeout
+		 * expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code timeout}
+		 */
+		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.timeout(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * If <code>true</code>, the request blocks until the task has completed.
+		 * <p>
+		 * API name: {@code wait_for_completion}
+		 */
+		public final Builder waitForCompletion(@Nullable Boolean value) {
+			this.waitForCompletion = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -267,17 +362,26 @@ public TasksRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (ApiTypeHelper.isDefined(request.nodes)) {
+					params.put("nodes", request.nodes.stream().map(v -> v).collect(Collectors.joining(",")));
+				}
 				if (request.parentTaskId != null) {
 					params.put("parent_task_id", request.parentTaskId);
 				}
 				if (request.detailed != null) {
 					params.put("detailed", String.valueOf(request.detailed));
 				}
+				if (request.time != null) {
+					params.put("time", request.time.jsonValue());
+				}
 				if (ApiTypeHelper.isDefined(request.actions)) {
 					params.put("actions", request.actions.stream().map(v -> v).collect(Collectors.joining(",")));
 				}
-				if (ApiTypeHelper.isDefined(request.nodeId)) {
-					params.put("node_id", request.nodeId.stream().map(v -> v).collect(Collectors.joining(",")));
+				if (request.waitForCompletion != null) {
+					params.put("wait_for_completion", String.valueOf(request.waitForCompletion));
+				}
+				if (request.timeout != null) {
+					params.put("timeout", request.timeout._toJsonString());
 				}
 				return params;
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TemplatesRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TemplatesRequest.java
index 150e9d865..229396232 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TemplatesRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TemplatesRequest.java
@@ -20,6 +20,7 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -54,12 +55,11 @@
 // typedef: cat.templates.Request
 
 /**
- * Get index template information. Get information about the index templates in
- * a cluster. You can use index templates to apply index settings and field
- * mappings to new indices at creation. IMPORTANT: cat APIs are only intended
- * for human consumption using the command line or Kibana console. They are not
- * intended for use by applications. For application consumption, use the get
- * index template API.
+ * Returns information about index templates in a cluster. You can use index
+ * templates to apply index settings and field mappings to new indices at
+ * creation. IMPORTANT: cat APIs are only intended for human consumption using
+ * the command line or Kibana console. They are not intended for use by
+ * applications. For application consumption, use the get index template API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.templates.Request">API
  *      specification</a>
@@ -69,6 +69,9 @@ public class TemplatesRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	@Nullable
 	private final String name;
 
@@ -77,6 +80,7 @@ public class TemplatesRequest extends CatRequestBase {
 	private TemplatesRequest(Builder builder) {
 
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 		this.name = builder.name;
 
 	}
@@ -99,6 +103,16 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	/**
 	 * The name of the template to return. Accepts wildcard expressions. If omitted,
 	 * all templates are returned.
@@ -122,6 +136,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
 		@Nullable
 		private String name;
 
@@ -139,6 +156,25 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		/**
 		 * The name of the template to return. Accepts wildcard expressions. If omitted,
 		 * all templates are returned.
@@ -231,6 +267,9 @@ public TemplatesRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.local != null) {
 					params.put("local", String.valueOf(request.local));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ThreadPoolRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ThreadPoolRequest.java
index b9b79ea4f..c4f0fdd6b 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ThreadPoolRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/ThreadPoolRequest.java
@@ -20,6 +20,7 @@
 package co.elastic.clients.elasticsearch.cat;
 
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.elasticsearch._types.TimeUnit;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
@@ -58,11 +59,11 @@
 // typedef: cat.thread_pool.Request
 
 /**
- * Get thread pool statistics. Get thread pool statistics for each node in a
- * cluster. Returned information includes all built-in thread pools and custom
- * thread pools. IMPORTANT: cat APIs are only intended for human consumption
- * using the command line or Kibana console. They are not intended for use by
- * applications. For application consumption, use the nodes info API.
+ * Returns thread pool statistics for each node in a cluster. Returned
+ * information includes all built-in thread pools and custom thread pools.
+ * IMPORTANT: cat APIs are only intended for human consumption using the command
+ * line or Kibana console. They are not intended for use by applications. For
+ * application consumption, use the nodes info API.
  * 
  * @see <a href="../doc-files/api-spec.html#cat.thread_pool.Request">API
  *      specification</a>
@@ -72,6 +73,9 @@ public class ThreadPoolRequest extends CatRequestBase {
 	@Nullable
 	private final Boolean local;
 
+	@Nullable
+	private final Time masterTimeout;
+
 	private final List<String> threadPoolPatterns;
 
 	@Nullable
@@ -82,6 +86,7 @@ public class ThreadPoolRequest extends CatRequestBase {
 	private ThreadPoolRequest(Builder builder) {
 
 		this.local = builder.local;
+		this.masterTimeout = builder.masterTimeout;
 		this.threadPoolPatterns = ApiTypeHelper.unmodifiable(builder.threadPoolPatterns);
 		this.time = builder.time;
 
@@ -105,6 +110,16 @@ public final Boolean local() {
 		return this.local;
 	}
 
+	/**
+	 * Period to wait for a connection to the master node.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
 	/**
 	 * A comma-separated list of thread pool names used to limit the request.
 	 * Accepts wildcard expressions.
@@ -137,6 +152,9 @@ public static class Builder extends CatRequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean local;
 
+		@Nullable
+		private Time masterTimeout;
+
 		@Nullable
 		private List<String> threadPoolPatterns;
 
@@ -157,6 +175,25 @@ public final Builder local(@Nullable Boolean value) {
 			return this;
 		}
 
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
 		/**
 		 * A comma-separated list of thread pool names used to limit the request.
 		 * Accepts wildcard expressions.
@@ -276,6 +313,9 @@ public ThreadPoolRequest build() {
 			request -> {
 				Map<String, String> params = new HashMap<>();
 				params.put("format", "json");
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
 				if (request.time != null) {
 					params.put("time", request.time.jsonValue());
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TransformsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TransformsRequest.java
index c8a3bd62f..095b25d87 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TransformsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/TransformsRequest.java
@@ -59,8 +59,7 @@
 // typedef: cat.transforms.Request
 
 /**
- * Get transform information. Get configuration and usage information about
- * transforms.
+ * Get transforms. Returns configuration and usage information about transforms.
  * <p>
  * CAT APIs are only intended for human consumption using the Kibana console or
  * command line. They are not intended for use by applications. For application
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowRequest.java
index 7bd6ab476..b66a8257a 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/FollowRequest.java
@@ -23,7 +23,6 @@
 import co.elastic.clients.elasticsearch._types.RequestBase;
 import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.elasticsearch._types.WaitForActiveShards;
-import co.elastic.clients.elasticsearch.indices.IndexSettings;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
@@ -35,7 +34,6 @@
 import co.elastic.clients.util.ApiTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
-import java.lang.Integer;
 import java.lang.Long;
 import java.lang.String;
 import java.util.HashMap;
@@ -72,21 +70,19 @@
  */
 @JsonpDeserializable
 public class FollowRequest extends RequestBase implements JsonpSerializable {
-	@Nullable
-	private final String dataStreamName;
-
 	private final String index;
 
+	@Nullable
 	private final String leaderIndex;
 
 	@Nullable
 	private final Long maxOutstandingReadRequests;
 
 	@Nullable
-	private final Integer maxOutstandingWriteRequests;
+	private final Long maxOutstandingWriteRequests;
 
 	@Nullable
-	private final Integer maxReadRequestOperationCount;
+	private final Long maxReadRequestOperationCount;
 
 	@Nullable
 	private final String maxReadRequestSize;
@@ -95,13 +91,13 @@ public class FollowRequest extends RequestBase implements JsonpSerializable {
 	private final Time maxRetryDelay;
 
 	@Nullable
-	private final Integer maxWriteBufferCount;
+	private final Long maxWriteBufferCount;
 
 	@Nullable
 	private final String maxWriteBufferSize;
 
 	@Nullable
-	private final Integer maxWriteRequestOperationCount;
+	private final Long maxWriteRequestOperationCount;
 
 	@Nullable
 	private final String maxWriteRequestSize;
@@ -109,10 +105,8 @@ public class FollowRequest extends RequestBase implements JsonpSerializable {
 	@Nullable
 	private final Time readPollTimeout;
 
-	private final String remoteCluster;
-
 	@Nullable
-	private final IndexSettings settings;
+	private final String remoteCluster;
 
 	@Nullable
 	private final WaitForActiveShards waitForActiveShards;
@@ -121,9 +115,8 @@ public class FollowRequest extends RequestBase implements JsonpSerializable {
 
 	private FollowRequest(Builder builder) {
 
-		this.dataStreamName = builder.dataStreamName;
 		this.index = ApiTypeHelper.requireNonNull(builder.index, this, "index");
-		this.leaderIndex = ApiTypeHelper.requireNonNull(builder.leaderIndex, this, "leaderIndex");
+		this.leaderIndex = builder.leaderIndex;
 		this.maxOutstandingReadRequests = builder.maxOutstandingReadRequests;
 		this.maxOutstandingWriteRequests = builder.maxOutstandingWriteRequests;
 		this.maxReadRequestOperationCount = builder.maxReadRequestOperationCount;
@@ -134,8 +127,7 @@ private FollowRequest(Builder builder) {
 		this.maxWriteRequestOperationCount = builder.maxWriteRequestOperationCount;
 		this.maxWriteRequestSize = builder.maxWriteRequestSize;
 		this.readPollTimeout = builder.readPollTimeout;
-		this.remoteCluster = ApiTypeHelper.requireNonNull(builder.remoteCluster, this, "remoteCluster");
-		this.settings = builder.settings;
+		this.remoteCluster = builder.remoteCluster;
 		this.waitForActiveShards = builder.waitForActiveShards;
 
 	}
@@ -145,18 +137,7 @@ public static FollowRequest of(Function<Builder, ObjectBuilder<FollowRequest>> f
 	}
 
 	/**
-	 * If the leader index is part of a data stream, the name to which the local
-	 * data stream for the followed index should be renamed.
-	 * <p>
-	 * API name: {@code data_stream_name}
-	 */
-	@Nullable
-	public final String dataStreamName() {
-		return this.dataStreamName;
-	}
-
-	/**
-	 * Required - The name of the follower index.
+	 * Required - The name of the follower index
 	 * <p>
 	 * API name: {@code index}
 	 */
@@ -165,17 +146,14 @@ public final String index() {
 	}
 
 	/**
-	 * Required - The name of the index in the leader cluster to follow.
-	 * <p>
 	 * API name: {@code leader_index}
 	 */
+	@Nullable
 	public final String leaderIndex() {
 		return this.leaderIndex;
 	}
 
 	/**
-	 * The maximum number of outstanding reads requests from the remote cluster.
-	 * <p>
 	 * API name: {@code max_outstanding_read_requests}
 	 */
 	@Nullable
@@ -184,29 +162,22 @@ public final Long maxOutstandingReadRequests() {
 	}
 
 	/**
-	 * The maximum number of outstanding write requests on the follower.
-	 * <p>
 	 * API name: {@code max_outstanding_write_requests}
 	 */
 	@Nullable
-	public final Integer maxOutstandingWriteRequests() {
+	public final Long maxOutstandingWriteRequests() {
 		return this.maxOutstandingWriteRequests;
 	}
 
 	/**
-	 * The maximum number of operations to pull per read from the remote cluster.
-	 * <p>
 	 * API name: {@code max_read_request_operation_count}
 	 */
 	@Nullable
-	public final Integer maxReadRequestOperationCount() {
+	public final Long maxReadRequestOperationCount() {
 		return this.maxReadRequestOperationCount;
 	}
 
 	/**
-	 * The maximum size in bytes of per read of a batch of operations pulled from
-	 * the remote cluster.
-	 * <p>
 	 * API name: {@code max_read_request_size}
 	 */
 	@Nullable
@@ -215,9 +186,6 @@ public final String maxReadRequestSize() {
 	}
 
 	/**
-	 * The maximum time to wait before retrying an operation that failed
-	 * exceptionally. An exponential backoff strategy is employed when retrying.
-	 * <p>
 	 * API name: {@code max_retry_delay}
 	 */
 	@Nullable
@@ -226,22 +194,14 @@ public final Time maxRetryDelay() {
 	}
 
 	/**
-	 * The maximum number of operations that can be queued for writing. When this
-	 * limit is reached, reads from the remote cluster will be deferred until the
-	 * number of queued operations goes below the limit.
-	 * <p>
 	 * API name: {@code max_write_buffer_count}
 	 */
 	@Nullable
-	public final Integer maxWriteBufferCount() {
+	public final Long maxWriteBufferCount() {
 		return this.maxWriteBufferCount;
 	}
 
 	/**
-	 * The maximum total bytes of operations that can be queued for writing. When
-	 * this limit is reached, reads from the remote cluster will be deferred until
-	 * the total bytes of queued operations goes below the limit.
-	 * <p>
 	 * API name: {@code max_write_buffer_size}
 	 */
 	@Nullable
@@ -250,20 +210,14 @@ public final String maxWriteBufferSize() {
 	}
 
 	/**
-	 * The maximum number of operations per bulk write request executed on the
-	 * follower.
-	 * <p>
 	 * API name: {@code max_write_request_operation_count}
 	 */
 	@Nullable
-	public final Integer maxWriteRequestOperationCount() {
+	public final Long maxWriteRequestOperationCount() {
 		return this.maxWriteRequestOperationCount;
 	}
 
 	/**
-	 * The maximum total bytes of operations per bulk write request executed on the
-	 * follower.
-	 * <p>
 	 * API name: {@code max_write_request_size}
 	 */
 	@Nullable
@@ -272,12 +226,6 @@ public final String maxWriteRequestSize() {
 	}
 
 	/**
-	 * The maximum time to wait for new operations on the remote cluster when the
-	 * follower index is synchronized with the leader index. When the timeout has
-	 * elapsed, the poll for operations will return to the follower so that it can
-	 * update some statistics. Then the follower will immediately attempt to read
-	 * from the leader again.
-	 * <p>
 	 * API name: {@code read_poll_timeout}
 	 */
 	@Nullable
@@ -286,30 +234,18 @@ public final Time readPollTimeout() {
 	}
 
 	/**
-	 * Required - The remote cluster containing the leader index.
-	 * <p>
 	 * API name: {@code remote_cluster}
 	 */
+	@Nullable
 	public final String remoteCluster() {
 		return this.remoteCluster;
 	}
 
 	/**
-	 * Settings to override from the leader index.
-	 * <p>
-	 * API name: {@code settings}
-	 */
-	@Nullable
-	public final IndexSettings settings() {
-		return this.settings;
-	}
-
-	/**
-	 * Specifies the number of shards to wait on being active before responding.
-	 * This defaults to waiting on none of the shards to be active. A shard must be
-	 * restored from the leader index before being active. Restoring a follower
-	 * shard requires transferring all the remote Lucene segment files to the
-	 * follower index.
+	 * Sets the number of shard copies that must be active before returning.
+	 * Defaults to 0. Set to <code>all</code> for all shard copies, otherwise set to
+	 * any non-negative value less than or equal to the total number of copies for
+	 * the shard (number of replicas + 1)
 	 * <p>
 	 * API name: {@code wait_for_active_shards}
 	 */
@@ -329,14 +265,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.dataStreamName != null) {
-			generator.writeKey("data_stream_name");
-			generator.write(this.dataStreamName);
+		if (this.leaderIndex != null) {
+			generator.writeKey("leader_index");
+			generator.write(this.leaderIndex);
 
 		}
-		generator.writeKey("leader_index");
-		generator.write(this.leaderIndex);
-
 		if (this.maxOutstandingReadRequests != null) {
 			generator.writeKey("max_outstanding_read_requests");
 			generator.write(this.maxOutstandingReadRequests);
@@ -387,12 +320,9 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			this.readPollTimeout.serialize(generator, mapper);
 
 		}
-		generator.writeKey("remote_cluster");
-		generator.write(this.remoteCluster);
-
-		if (this.settings != null) {
-			generator.writeKey("settings");
-			this.settings.serialize(generator, mapper);
+		if (this.remoteCluster != null) {
+			generator.writeKey("remote_cluster");
+			generator.write(this.remoteCluster);
 
 		}
 
@@ -405,21 +335,19 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 	 */
 
 	public static class Builder extends RequestBase.AbstractBuilder<Builder> implements ObjectBuilder<FollowRequest> {
-		@Nullable
-		private String dataStreamName;
-
 		private String index;
 
+		@Nullable
 		private String leaderIndex;
 
 		@Nullable
 		private Long maxOutstandingReadRequests;
 
 		@Nullable
-		private Integer maxOutstandingWriteRequests;
+		private Long maxOutstandingWriteRequests;
 
 		@Nullable
-		private Integer maxReadRequestOperationCount;
+		private Long maxReadRequestOperationCount;
 
 		@Nullable
 		private String maxReadRequestSize;
@@ -428,13 +356,13 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
 		private Time maxRetryDelay;
 
 		@Nullable
-		private Integer maxWriteBufferCount;
+		private Long maxWriteBufferCount;
 
 		@Nullable
 		private String maxWriteBufferSize;
 
 		@Nullable
-		private Integer maxWriteRequestOperationCount;
+		private Long maxWriteRequestOperationCount;
 
 		@Nullable
 		private String maxWriteRequestSize;
@@ -442,27 +370,14 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
 		@Nullable
 		private Time readPollTimeout;
 
-		private String remoteCluster;
-
 		@Nullable
-		private IndexSettings settings;
+		private String remoteCluster;
 
 		@Nullable
 		private WaitForActiveShards waitForActiveShards;
 
 		/**
-		 * If the leader index is part of a data stream, the name to which the local
-		 * data stream for the followed index should be renamed.
-		 * <p>
-		 * API name: {@code data_stream_name}
-		 */
-		public final Builder dataStreamName(@Nullable String value) {
-			this.dataStreamName = value;
-			return this;
-		}
-
-		/**
-		 * Required - The name of the follower index.
+		 * Required - The name of the follower index
 		 * <p>
 		 * API name: {@code index}
 		 */
@@ -472,18 +387,14 @@ public final Builder index(String value) {
 		}
 
 		/**
-		 * Required - The name of the index in the leader cluster to follow.
-		 * <p>
 		 * API name: {@code leader_index}
 		 */
-		public final Builder leaderIndex(String value) {
+		public final Builder leaderIndex(@Nullable String value) {
 			this.leaderIndex = value;
 			return this;
 		}
 
 		/**
-		 * The maximum number of outstanding reads requests from the remote cluster.
-		 * <p>
 		 * API name: {@code max_outstanding_read_requests}
 		 */
 		public final Builder maxOutstandingReadRequests(@Nullable Long value) {
@@ -492,29 +403,22 @@ public final Builder maxOutstandingReadRequests(@Nullable Long value) {
 		}
 
 		/**
-		 * The maximum number of outstanding write requests on the follower.
-		 * <p>
 		 * API name: {@code max_outstanding_write_requests}
 		 */
-		public final Builder maxOutstandingWriteRequests(@Nullable Integer value) {
+		public final Builder maxOutstandingWriteRequests(@Nullable Long value) {
 			this.maxOutstandingWriteRequests = value;
 			return this;
 		}
 
 		/**
-		 * The maximum number of operations to pull per read from the remote cluster.
-		 * <p>
 		 * API name: {@code max_read_request_operation_count}
 		 */
-		public final Builder maxReadRequestOperationCount(@Nullable Integer value) {
+		public final Builder maxReadRequestOperationCount(@Nullable Long value) {
 			this.maxReadRequestOperationCount = value;
 			return this;
 		}
 
 		/**
-		 * The maximum size in bytes of per read of a batch of operations pulled from
-		 * the remote cluster.
-		 * <p>
 		 * API name: {@code max_read_request_size}
 		 */
 		public final Builder maxReadRequestSize(@Nullable String value) {
@@ -523,9 +427,6 @@ public final Builder maxReadRequestSize(@Nullable String value) {
 		}
 
 		/**
-		 * The maximum time to wait before retrying an operation that failed
-		 * exceptionally. An exponential backoff strategy is employed when retrying.
-		 * <p>
 		 * API name: {@code max_retry_delay}
 		 */
 		public final Builder maxRetryDelay(@Nullable Time value) {
@@ -534,9 +435,6 @@ public final Builder maxRetryDelay(@Nullable Time value) {
 		}
 
 		/**
-		 * The maximum time to wait before retrying an operation that failed
-		 * exceptionally. An exponential backoff strategy is employed when retrying.
-		 * <p>
 		 * API name: {@code max_retry_delay}
 		 */
 		public final Builder maxRetryDelay(Function<Time.Builder, ObjectBuilder<Time>> fn) {
@@ -544,22 +442,14 @@ public final Builder maxRetryDelay(Function<Time.Builder, ObjectBuilder<Time>> f
 		}
 
 		/**
-		 * The maximum number of operations that can be queued for writing. When this
-		 * limit is reached, reads from the remote cluster will be deferred until the
-		 * number of queued operations goes below the limit.
-		 * <p>
 		 * API name: {@code max_write_buffer_count}
 		 */
-		public final Builder maxWriteBufferCount(@Nullable Integer value) {
+		public final Builder maxWriteBufferCount(@Nullable Long value) {
 			this.maxWriteBufferCount = value;
 			return this;
 		}
 
 		/**
-		 * The maximum total bytes of operations that can be queued for writing. When
-		 * this limit is reached, reads from the remote cluster will be deferred until
-		 * the total bytes of queued operations goes below the limit.
-		 * <p>
 		 * API name: {@code max_write_buffer_size}
 		 */
 		public final Builder maxWriteBufferSize(@Nullable String value) {
@@ -568,20 +458,14 @@ public final Builder maxWriteBufferSize(@Nullable String value) {
 		}
 
 		/**
-		 * The maximum number of operations per bulk write request executed on the
-		 * follower.
-		 * <p>
 		 * API name: {@code max_write_request_operation_count}
 		 */
-		public final Builder maxWriteRequestOperationCount(@Nullable Integer value) {
+		public final Builder maxWriteRequestOperationCount(@Nullable Long value) {
 			this.maxWriteRequestOperationCount = value;
 			return this;
 		}
 
 		/**
-		 * The maximum total bytes of operations per bulk write request executed on the
-		 * follower.
-		 * <p>
 		 * API name: {@code max_write_request_size}
 		 */
 		public final Builder maxWriteRequestSize(@Nullable String value) {
@@ -590,12 +474,6 @@ public final Builder maxWriteRequestSize(@Nullable String value) {
 		}
 
 		/**
-		 * The maximum time to wait for new operations on the remote cluster when the
-		 * follower index is synchronized with the leader index. When the timeout has
-		 * elapsed, the poll for operations will return to the follower so that it can
-		 * update some statistics. Then the follower will immediately attempt to read
-		 * from the leader again.
-		 * <p>
 		 * API name: {@code read_poll_timeout}
 		 */
 		public final Builder readPollTimeout(@Nullable Time value) {
@@ -604,12 +482,6 @@ public final Builder readPollTimeout(@Nullable Time value) {
 		}
 
 		/**
-		 * The maximum time to wait for new operations on the remote cluster when the
-		 * follower index is synchronized with the leader index. When the timeout has
-		 * elapsed, the poll for operations will return to the follower so that it can
-		 * update some statistics. Then the follower will immediately attempt to read
-		 * from the leader again.
-		 * <p>
 		 * API name: {@code read_poll_timeout}
 		 */
 		public final Builder readPollTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
@@ -617,40 +489,18 @@ public final Builder readPollTimeout(Function<Time.Builder, ObjectBuilder<Time>>
 		}
 
 		/**
-		 * Required - The remote cluster containing the leader index.
-		 * <p>
 		 * API name: {@code remote_cluster}
 		 */
-		public final Builder remoteCluster(String value) {
+		public final Builder remoteCluster(@Nullable String value) {
 			this.remoteCluster = value;
 			return this;
 		}
 
 		/**
-		 * Settings to override from the leader index.
-		 * <p>
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(@Nullable IndexSettings value) {
-			this.settings = value;
-			return this;
-		}
-
-		/**
-		 * Settings to override from the leader index.
-		 * <p>
-		 * API name: {@code settings}
-		 */
-		public final Builder settings(Function<IndexSettings.Builder, ObjectBuilder<IndexSettings>> fn) {
-			return this.settings(fn.apply(new IndexSettings.Builder()).build());
-		}
-
-		/**
-		 * Specifies the number of shards to wait on being active before responding.
-		 * This defaults to waiting on none of the shards to be active. A shard must be
-		 * restored from the leader index before being active. Restoring a follower
-		 * shard requires transferring all the remote Lucene segment files to the
-		 * follower index.
+		 * Sets the number of shard copies that must be active before returning.
+		 * Defaults to 0. Set to <code>all</code> for all shard copies, otherwise set to
+		 * any non-negative value less than or equal to the total number of copies for
+		 * the shard (number of replicas + 1)
 		 * <p>
 		 * API name: {@code wait_for_active_shards}
 		 */
@@ -660,11 +510,10 @@ public final Builder waitForActiveShards(@Nullable WaitForActiveShards value) {
 		}
 
 		/**
-		 * Specifies the number of shards to wait on being active before responding.
-		 * This defaults to waiting on none of the shards to be active. A shard must be
-		 * restored from the leader index before being active. Restoring a follower
-		 * shard requires transferring all the remote Lucene segment files to the
-		 * follower index.
+		 * Sets the number of shard copies that must be active before returning.
+		 * Defaults to 0. Set to <code>all</code> for all shard copies, otherwise set to
+		 * any non-negative value less than or equal to the total number of copies for
+		 * the shard (number of replicas + 1)
 		 * <p>
 		 * API name: {@code wait_for_active_shards}
 		 */
@@ -701,24 +550,22 @@ public FollowRequest build() {
 
 	protected static void setupFollowRequestDeserializer(ObjectDeserializer<FollowRequest.Builder> op) {
 
-		op.add(Builder::dataStreamName, JsonpDeserializer.stringDeserializer(), "data_stream_name");
 		op.add(Builder::leaderIndex, JsonpDeserializer.stringDeserializer(), "leader_index");
 		op.add(Builder::maxOutstandingReadRequests, JsonpDeserializer.longDeserializer(),
 				"max_outstanding_read_requests");
-		op.add(Builder::maxOutstandingWriteRequests, JsonpDeserializer.integerDeserializer(),
+		op.add(Builder::maxOutstandingWriteRequests, JsonpDeserializer.longDeserializer(),
 				"max_outstanding_write_requests");
-		op.add(Builder::maxReadRequestOperationCount, JsonpDeserializer.integerDeserializer(),
+		op.add(Builder::maxReadRequestOperationCount, JsonpDeserializer.longDeserializer(),
 				"max_read_request_operation_count");
 		op.add(Builder::maxReadRequestSize, JsonpDeserializer.stringDeserializer(), "max_read_request_size");
 		op.add(Builder::maxRetryDelay, Time._DESERIALIZER, "max_retry_delay");
-		op.add(Builder::maxWriteBufferCount, JsonpDeserializer.integerDeserializer(), "max_write_buffer_count");
+		op.add(Builder::maxWriteBufferCount, JsonpDeserializer.longDeserializer(), "max_write_buffer_count");
 		op.add(Builder::maxWriteBufferSize, JsonpDeserializer.stringDeserializer(), "max_write_buffer_size");
-		op.add(Builder::maxWriteRequestOperationCount, JsonpDeserializer.integerDeserializer(),
+		op.add(Builder::maxWriteRequestOperationCount, JsonpDeserializer.longDeserializer(),
 				"max_write_request_operation_count");
 		op.add(Builder::maxWriteRequestSize, JsonpDeserializer.stringDeserializer(), "max_write_request_size");
 		op.add(Builder::readPollTimeout, Time._DESERIALIZER, "read_poll_timeout");
 		op.add(Builder::remoteCluster, JsonpDeserializer.stringDeserializer(), "remote_cluster");
-		op.add(Builder::settings, IndexSettings._DESERIALIZER, "settings");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/follow_info/FollowerIndexParameters.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/follow_info/FollowerIndexParameters.java
index ed314baf5..cd9fc3ed2 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/follow_info/FollowerIndexParameters.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ccr/follow_info/FollowerIndexParameters.java
@@ -27,11 +27,11 @@
 import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.util.ApiTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
 import co.elastic.clients.util.WithJsonObjectBuilderBase;
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Integer;
-import java.lang.Long;
 import java.lang.String;
 import java.util.Objects;
 import java.util.function.Function;
@@ -62,50 +62,46 @@
  */
 @JsonpDeserializable
 public class FollowerIndexParameters implements JsonpSerializable {
-	@Nullable
-	private final Long maxOutstandingReadRequests;
+	private final int maxOutstandingReadRequests;
 
-	@Nullable
-	private final Integer maxOutstandingWriteRequests;
+	private final int maxOutstandingWriteRequests;
 
-	@Nullable
-	private final Integer maxReadRequestOperationCount;
+	private final int maxReadRequestOperationCount;
 
-	@Nullable
 	private final String maxReadRequestSize;
 
-	@Nullable
 	private final Time maxRetryDelay;
 
-	@Nullable
-	private final Integer maxWriteBufferCount;
+	private final int maxWriteBufferCount;
 
-	@Nullable
 	private final String maxWriteBufferSize;
 
-	@Nullable
-	private final Integer maxWriteRequestOperationCount;
+	private final int maxWriteRequestOperationCount;
 
-	@Nullable
 	private final String maxWriteRequestSize;
 
-	@Nullable
 	private final Time readPollTimeout;
 
 	// ---------------------------------------------------------------------------------------------
 
 	private FollowerIndexParameters(Builder builder) {
 
-		this.maxOutstandingReadRequests = builder.maxOutstandingReadRequests;
-		this.maxOutstandingWriteRequests = builder.maxOutstandingWriteRequests;
-		this.maxReadRequestOperationCount = builder.maxReadRequestOperationCount;
-		this.maxReadRequestSize = builder.maxReadRequestSize;
-		this.maxRetryDelay = builder.maxRetryDelay;
-		this.maxWriteBufferCount = builder.maxWriteBufferCount;
-		this.maxWriteBufferSize = builder.maxWriteBufferSize;
-		this.maxWriteRequestOperationCount = builder.maxWriteRequestOperationCount;
-		this.maxWriteRequestSize = builder.maxWriteRequestSize;
-		this.readPollTimeout = builder.readPollTimeout;
+		this.maxOutstandingReadRequests = ApiTypeHelper.requireNonNull(builder.maxOutstandingReadRequests, this,
+				"maxOutstandingReadRequests");
+		this.maxOutstandingWriteRequests = ApiTypeHelper.requireNonNull(builder.maxOutstandingWriteRequests, this,
+				"maxOutstandingWriteRequests");
+		this.maxReadRequestOperationCount = ApiTypeHelper.requireNonNull(builder.maxReadRequestOperationCount, this,
+				"maxReadRequestOperationCount");
+		this.maxReadRequestSize = ApiTypeHelper.requireNonNull(builder.maxReadRequestSize, this, "maxReadRequestSize");
+		this.maxRetryDelay = ApiTypeHelper.requireNonNull(builder.maxRetryDelay, this, "maxRetryDelay");
+		this.maxWriteBufferCount = ApiTypeHelper.requireNonNull(builder.maxWriteBufferCount, this,
+				"maxWriteBufferCount");
+		this.maxWriteBufferSize = ApiTypeHelper.requireNonNull(builder.maxWriteBufferSize, this, "maxWriteBufferSize");
+		this.maxWriteRequestOperationCount = ApiTypeHelper.requireNonNull(builder.maxWriteRequestOperationCount, this,
+				"maxWriteRequestOperationCount");
+		this.maxWriteRequestSize = ApiTypeHelper.requireNonNull(builder.maxWriteRequestSize, this,
+				"maxWriteRequestSize");
+		this.readPollTimeout = ApiTypeHelper.requireNonNull(builder.readPollTimeout, this, "readPollTimeout");
 
 	}
 
@@ -114,113 +110,71 @@ public static FollowerIndexParameters of(Function<Builder, ObjectBuilder<Followe
 	}
 
 	/**
-	 * The maximum number of outstanding reads requests from the remote cluster.
-	 * <p>
-	 * API name: {@code max_outstanding_read_requests}
+	 * Required - API name: {@code max_outstanding_read_requests}
 	 */
-	@Nullable
-	public final Long maxOutstandingReadRequests() {
+	public final int maxOutstandingReadRequests() {
 		return this.maxOutstandingReadRequests;
 	}
 
 	/**
-	 * The maximum number of outstanding write requests on the follower.
-	 * <p>
-	 * API name: {@code max_outstanding_write_requests}
+	 * Required - API name: {@code max_outstanding_write_requests}
 	 */
-	@Nullable
-	public final Integer maxOutstandingWriteRequests() {
+	public final int maxOutstandingWriteRequests() {
 		return this.maxOutstandingWriteRequests;
 	}
 
 	/**
-	 * The maximum number of operations to pull per read from the remote cluster.
-	 * <p>
-	 * API name: {@code max_read_request_operation_count}
+	 * Required - API name: {@code max_read_request_operation_count}
 	 */
-	@Nullable
-	public final Integer maxReadRequestOperationCount() {
+	public final int maxReadRequestOperationCount() {
 		return this.maxReadRequestOperationCount;
 	}
 
 	/**
-	 * The maximum size in bytes of per read of a batch of operations pulled from
-	 * the remote cluster.
-	 * <p>
-	 * API name: {@code max_read_request_size}
+	 * Required - API name: {@code max_read_request_size}
 	 */
-	@Nullable
 	public final String maxReadRequestSize() {
 		return this.maxReadRequestSize;
 	}
 
 	/**
-	 * The maximum time to wait before retrying an operation that failed
-	 * exceptionally. An exponential backoff strategy is employed when retrying.
-	 * <p>
-	 * API name: {@code max_retry_delay}
+	 * Required - API name: {@code max_retry_delay}
 	 */
-	@Nullable
 	public final Time maxRetryDelay() {
 		return this.maxRetryDelay;
 	}
 
 	/**
-	 * The maximum number of operations that can be queued for writing. When this
-	 * limit is reached, reads from the remote cluster will be deferred until the
-	 * number of queued operations goes below the limit.
-	 * <p>
-	 * API name: {@code max_write_buffer_count}
+	 * Required - API name: {@code max_write_buffer_count}
 	 */
-	@Nullable
-	public final Integer maxWriteBufferCount() {
+	public final int maxWriteBufferCount() {
 		return this.maxWriteBufferCount;
 	}
 
 	/**
-	 * The maximum total bytes of operations that can be queued for writing. When
-	 * this limit is reached, reads from the remote cluster will be deferred until
-	 * the total bytes of queued operations goes below the limit.
-	 * <p>
-	 * API name: {@code max_write_buffer_size}
+	 * Required - API name: {@code max_write_buffer_size}
 	 */
-	@Nullable
 	public final String maxWriteBufferSize() {
 		return this.maxWriteBufferSize;
 	}
 
 	/**
-	 * The maximum number of operations per bulk write request executed on the
-	 * follower.
-	 * <p>
-	 * API name: {@code max_write_request_operation_count}
+	 * Required - API name: {@code max_write_request_operation_count}
 	 */
-	@Nullable
-	public final Integer maxWriteRequestOperationCount() {
+	public final int maxWriteRequestOperationCount() {
 		return this.maxWriteRequestOperationCount;
 	}
 
 	/**
-	 * The maximum total bytes of operations per bulk write request executed on the
-	 * follower.
-	 * <p>
-	 * API name: {@code max_write_request_size}
+	 * Required - API name: {@code max_write_request_size}
 	 */
-	@Nullable
 	public final String maxWriteRequestSize() {
 		return this.maxWriteRequestSize;
 	}
 
 	/**
-	 * The maximum time to wait for new operations on the remote cluster when the
-	 * follower index is synchronized with the leader index. When the timeout has
-	 * elapsed, the poll for operations will return to the follower so that it can
-	 * update some statistics. Then the follower will immediately attempt to read
-	 * from the leader again.
-	 * <p>
-	 * API name: {@code read_poll_timeout}
+	 * Required - API name: {@code read_poll_timeout}
 	 */
-	@Nullable
 	public final Time readPollTimeout() {
 		return this.readPollTimeout;
 	}
@@ -236,56 +190,35 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		if (this.maxOutstandingReadRequests != null) {
-			generator.writeKey("max_outstanding_read_requests");
-			generator.write(this.maxOutstandingReadRequests);
+		generator.writeKey("max_outstanding_read_requests");
+		generator.write(this.maxOutstandingReadRequests);
 
-		}
-		if (this.maxOutstandingWriteRequests != null) {
-			generator.writeKey("max_outstanding_write_requests");
-			generator.write(this.maxOutstandingWriteRequests);
+		generator.writeKey("max_outstanding_write_requests");
+		generator.write(this.maxOutstandingWriteRequests);
 
-		}
-		if (this.maxReadRequestOperationCount != null) {
-			generator.writeKey("max_read_request_operation_count");
-			generator.write(this.maxReadRequestOperationCount);
+		generator.writeKey("max_read_request_operation_count");
+		generator.write(this.maxReadRequestOperationCount);
 
-		}
-		if (this.maxReadRequestSize != null) {
-			generator.writeKey("max_read_request_size");
-			generator.write(this.maxReadRequestSize);
+		generator.writeKey("max_read_request_size");
+		generator.write(this.maxReadRequestSize);
 
-		}
-		if (this.maxRetryDelay != null) {
-			generator.writeKey("max_retry_delay");
-			this.maxRetryDelay.serialize(generator, mapper);
+		generator.writeKey("max_retry_delay");
+		this.maxRetryDelay.serialize(generator, mapper);
 
-		}
-		if (this.maxWriteBufferCount != null) {
-			generator.writeKey("max_write_buffer_count");
-			generator.write(this.maxWriteBufferCount);
+		generator.writeKey("max_write_buffer_count");
+		generator.write(this.maxWriteBufferCount);
 
-		}
-		if (this.maxWriteBufferSize != null) {
-			generator.writeKey("max_write_buffer_size");
-			generator.write(this.maxWriteBufferSize);
+		generator.writeKey("max_write_buffer_size");
+		generator.write(this.maxWriteBufferSize);
 
-		}
-		if (this.maxWriteRequestOperationCount != null) {
-			generator.writeKey("max_write_request_operation_count");
-			generator.write(this.maxWriteRequestOperationCount);
+		generator.writeKey("max_write_request_operation_count");
+		generator.write(this.maxWriteRequestOperationCount);
 
-		}
-		if (this.maxWriteRequestSize != null) {
-			generator.writeKey("max_write_request_size");
-			generator.write(this.maxWriteRequestSize);
+		generator.writeKey("max_write_request_size");
+		generator.write(this.maxWriteRequestSize);
 
-		}
-		if (this.readPollTimeout != null) {
-			generator.writeKey("read_poll_timeout");
-			this.readPollTimeout.serialize(generator, mapper);
-
-		}
+		generator.writeKey("read_poll_timeout");
+		this.readPollTimeout.serialize(generator, mapper);
 
 	}
 
@@ -303,166 +236,115 @@ public String toString() {
 	public static class Builder extends WithJsonObjectBuilderBase<Builder>
 			implements
 				ObjectBuilder<FollowerIndexParameters> {
-		@Nullable
-		private Long maxOutstandingReadRequests;
+		private Integer maxOutstandingReadRequests;
 
-		@Nullable
 		private Integer maxOutstandingWriteRequests;
 
-		@Nullable
 		private Integer maxReadRequestOperationCount;
 
-		@Nullable
 		private String maxReadRequestSize;
 
-		@Nullable
 		private Time maxRetryDelay;
 
-		@Nullable
 		private Integer maxWriteBufferCount;
 
-		@Nullable
 		private String maxWriteBufferSize;
 
-		@Nullable
 		private Integer maxWriteRequestOperationCount;
 
-		@Nullable
 		private String maxWriteRequestSize;
 
-		@Nullable
 		private Time readPollTimeout;
 
 		/**
-		 * The maximum number of outstanding reads requests from the remote cluster.
-		 * <p>
-		 * API name: {@code max_outstanding_read_requests}
+		 * Required - API name: {@code max_outstanding_read_requests}
 		 */
-		public final Builder maxOutstandingReadRequests(@Nullable Long value) {
+		public final Builder maxOutstandingReadRequests(int value) {
 			this.maxOutstandingReadRequests = value;
 			return this;
 		}
 
 		/**
-		 * The maximum number of outstanding write requests on the follower.
-		 * <p>
-		 * API name: {@code max_outstanding_write_requests}
+		 * Required - API name: {@code max_outstanding_write_requests}
 		 */
-		public final Builder maxOutstandingWriteRequests(@Nullable Integer value) {
+		public final Builder maxOutstandingWriteRequests(int value) {
 			this.maxOutstandingWriteRequests = value;
 			return this;
 		}
 
 		/**
-		 * The maximum number of operations to pull per read from the remote cluster.
-		 * <p>
-		 * API name: {@code max_read_request_operation_count}
+		 * Required - API name: {@code max_read_request_operation_count}
 		 */
-		public final Builder maxReadRequestOperationCount(@Nullable Integer value) {
+		public final Builder maxReadRequestOperationCount(int value) {
 			this.maxReadRequestOperationCount = value;
 			return this;
 		}
 
 		/**
-		 * The maximum size in bytes of per read of a batch of operations pulled from
-		 * the remote cluster.
-		 * <p>
-		 * API name: {@code max_read_request_size}
+		 * Required - API name: {@code max_read_request_size}
 		 */
-		public final Builder maxReadRequestSize(@Nullable String value) {
+		public final Builder maxReadRequestSize(String value) {
 			this.maxReadRequestSize = value;
 			return this;
 		}
 
 		/**
-		 * The maximum time to wait before retrying an operation that failed
-		 * exceptionally. An exponential backoff strategy is employed when retrying.
-		 * <p>
-		 * API name: {@code max_retry_delay}
+		 * Required - API name: {@code max_retry_delay}
 		 */
-		public final Builder maxRetryDelay(@Nullable Time value) {
+		public final Builder maxRetryDelay(Time value) {
 			this.maxRetryDelay = value;
 			return this;
 		}
 
 		/**
-		 * The maximum time to wait before retrying an operation that failed
-		 * exceptionally. An exponential backoff strategy is employed when retrying.
-		 * <p>
-		 * API name: {@code max_retry_delay}
+		 * Required - API name: {@code max_retry_delay}
 		 */
 		public final Builder maxRetryDelay(Function<Time.Builder, ObjectBuilder<Time>> fn) {
 			return this.maxRetryDelay(fn.apply(new Time.Builder()).build());
 		}
 
 		/**
-		 * The maximum number of operations that can be queued for writing. When this
-		 * limit is reached, reads from the remote cluster will be deferred until the
-		 * number of queued operations goes below the limit.
-		 * <p>
-		 * API name: {@code max_write_buffer_count}
+		 * Required - API name: {@code max_write_buffer_count}
 		 */
-		public final Builder maxWriteBufferCount(@Nullable Integer value) {
+		public final Builder maxWriteBufferCount(int value) {
 			this.maxWriteBufferCount = value;
 			return this;
 		}
 
 		/**
-		 * The maximum total bytes of operations that can be queued for writing. When
-		 * this limit is reached, reads from the remote cluster will be deferred until
-		 * the total bytes of queued operations goes below the limit.
-		 * <p>
-		 * API name: {@code max_write_buffer_size}
+		 * Required - API name: {@code max_write_buffer_size}
 		 */
-		public final Builder maxWriteBufferSize(@Nullable String value) {
+		public final Builder maxWriteBufferSize(String value) {
 			this.maxWriteBufferSize = value;
 			return this;
 		}
 
 		/**
-		 * The maximum number of operations per bulk write request executed on the
-		 * follower.
-		 * <p>
-		 * API name: {@code max_write_request_operation_count}
+		 * Required - API name: {@code max_write_request_operation_count}
 		 */
-		public final Builder maxWriteRequestOperationCount(@Nullable Integer value) {
+		public final Builder maxWriteRequestOperationCount(int value) {
 			this.maxWriteRequestOperationCount = value;
 			return this;
 		}
 
 		/**
-		 * The maximum total bytes of operations per bulk write request executed on the
-		 * follower.
-		 * <p>
-		 * API name: {@code max_write_request_size}
+		 * Required - API name: {@code max_write_request_size}
 		 */
-		public final Builder maxWriteRequestSize(@Nullable String value) {
+		public final Builder maxWriteRequestSize(String value) {
 			this.maxWriteRequestSize = value;
 			return this;
 		}
 
 		/**
-		 * The maximum time to wait for new operations on the remote cluster when the
-		 * follower index is synchronized with the leader index. When the timeout has
-		 * elapsed, the poll for operations will return to the follower so that it can
-		 * update some statistics. Then the follower will immediately attempt to read
-		 * from the leader again.
-		 * <p>
-		 * API name: {@code read_poll_timeout}
+		 * Required - API name: {@code read_poll_timeout}
 		 */
-		public final Builder readPollTimeout(@Nullable Time value) {
+		public final Builder readPollTimeout(Time value) {
 			this.readPollTimeout = value;
 			return this;
 		}
 
 		/**
-		 * The maximum time to wait for new operations on the remote cluster when the
-		 * follower index is synchronized with the leader index. When the timeout has
-		 * elapsed, the poll for operations will return to the follower so that it can
-		 * update some statistics. Then the follower will immediately attempt to read
-		 * from the leader again.
-		 * <p>
-		 * API name: {@code read_poll_timeout}
+		 * Required - API name: {@code read_poll_timeout}
 		 */
 		public final Builder readPollTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
 			return this.readPollTimeout(fn.apply(new Time.Builder()).build());
@@ -497,7 +379,7 @@ public FollowerIndexParameters build() {
 	protected static void setupFollowerIndexParametersDeserializer(
 			ObjectDeserializer<FollowerIndexParameters.Builder> op) {
 
-		op.add(Builder::maxOutstandingReadRequests, JsonpDeserializer.longDeserializer(),
+		op.add(Builder::maxOutstandingReadRequests, JsonpDeserializer.integerDeserializer(),
 				"max_outstanding_read_requests");
 		op.add(Builder::maxOutstandingWriteRequests, JsonpDeserializer.integerDeserializer(),
 				"max_outstanding_write_requests");
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java
index 1d39e93b8..f03adcb03 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/SearchRequest.java
@@ -168,6 +168,9 @@ public class SearchRequest extends RequestBase implements JsonpSerializable {
 	@Nullable
 	private final Long maxConcurrentShardRequests;
 
+	@Nullable
+	private final String minCompatibleShardNode;
+
 	@Nullable
 	private final Double minScore;
 
@@ -281,6 +284,7 @@ private SearchRequest(Builder builder) {
 		this.knn = ApiTypeHelper.unmodifiable(builder.knn);
 		this.lenient = builder.lenient;
 		this.maxConcurrentShardRequests = builder.maxConcurrentShardRequests;
+		this.minCompatibleShardNode = builder.minCompatibleShardNode;
 		this.minScore = builder.minScore;
 		this.pit = builder.pit;
 		this.postFilter = builder.postFilter;
@@ -609,6 +613,17 @@ public final Long maxConcurrentShardRequests() {
 		return this.maxConcurrentShardRequests;
 	}
 
+	/**
+	 * The minimum version of the node that can handle the request Any handling node
+	 * with a lower version will fail the request.
+	 * <p>
+	 * API name: {@code min_compatible_shard_node}
+	 */
+	@Nullable
+	public final String minCompatibleShardNode() {
+		return this.minCompatibleShardNode;
+	}
+
 	/**
 	 * Minimum <code>_score</code> for matching documents. Documents with a lower
 	 * <code>_score</code> are not included in the search results.
@@ -1319,6 +1334,9 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
 		@Nullable
 		private Long maxConcurrentShardRequests;
 
+		@Nullable
+		private String minCompatibleShardNode;
+
 		@Nullable
 		private Double minScore;
 
@@ -1906,6 +1924,17 @@ public final Builder maxConcurrentShardRequests(@Nullable Long value) {
 			return this;
 		}
 
+		/**
+		 * The minimum version of the node that can handle the request Any handling node
+		 * with a lower version will fail the request.
+		 * <p>
+		 * API name: {@code min_compatible_shard_node}
+		 */
+		public final Builder minCompatibleShardNode(@Nullable String value) {
+			this.minCompatibleShardNode = value;
+			return this;
+		}
+
 		/**
 		 * Minimum <code>_score</code> for matching documents. Documents with a lower
 		 * <code>_score</code> are not included in the search results.
@@ -2744,6 +2773,9 @@ protected static void setupSearchRequestDeserializer(ObjectDeserializer<SearchRe
 				if (request.preFilterShardSize != null) {
 					params.put("pre_filter_shard_size", String.valueOf(request.preFilterShardSize));
 				}
+				if (request.minCompatibleShardNode != null) {
+					params.put("min_compatible_shard_node", request.minCompatibleShardNode);
+				}
 				if (request.forceSyntheticSource != null) {
 					params.put("force_synthetic_source", String.valueOf(request.forceSyntheticSource));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/Indicators.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/Indicators.java
index a4f85fb5f..f313d5945 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/Indicators.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/Indicators.java
@@ -82,9 +82,6 @@ public class Indicators implements JsonpSerializable {
 	@Nullable
 	private final ShardsCapacityIndicator shardsCapacity;
 
-	@Nullable
-	private final FileSettingsIndicator fileSettings;
-
 	// ---------------------------------------------------------------------------------------------
 
 	private Indicators(Builder builder) {
@@ -97,7 +94,6 @@ private Indicators(Builder builder) {
 		this.ilm = builder.ilm;
 		this.slm = builder.slm;
 		this.shardsCapacity = builder.shardsCapacity;
-		this.fileSettings = builder.fileSettings;
 
 	}
 
@@ -169,14 +165,6 @@ public final ShardsCapacityIndicator shardsCapacity() {
 		return this.shardsCapacity;
 	}
 
-	/**
-	 * API name: {@code file_settings}
-	 */
-	@Nullable
-	public final FileSettingsIndicator fileSettings() {
-		return this.fileSettings;
-	}
-
 	/**
 	 * Serialize this object to JSON.
 	 */
@@ -228,11 +216,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			this.shardsCapacity.serialize(generator, mapper);
 
 		}
-		if (this.fileSettings != null) {
-			generator.writeKey("file_settings");
-			this.fileSettings.serialize(generator, mapper);
-
-		}
 
 	}
 
@@ -272,9 +255,6 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
 		@Nullable
 		private ShardsCapacityIndicator shardsCapacity;
 
-		@Nullable
-		private FileSettingsIndicator fileSettings;
-
 		/**
 		 * API name: {@code master_is_stable}
 		 */
@@ -400,22 +380,6 @@ public final Builder shardsCapacity(
 			return this.shardsCapacity(fn.apply(new ShardsCapacityIndicator.Builder()).build());
 		}
 
-		/**
-		 * API name: {@code file_settings}
-		 */
-		public final Builder fileSettings(@Nullable FileSettingsIndicator value) {
-			this.fileSettings = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code file_settings}
-		 */
-		public final Builder fileSettings(
-				Function<FileSettingsIndicator.Builder, ObjectBuilder<FileSettingsIndicator>> fn) {
-			return this.fileSettings(fn.apply(new FileSettingsIndicator.Builder()).build());
-		}
-
 		@Override
 		protected Builder self() {
 			return this;
@@ -452,7 +416,6 @@ protected static void setupIndicatorsDeserializer(ObjectDeserializer<Indicators.
 		op.add(Builder::ilm, IlmIndicator._DESERIALIZER, "ilm");
 		op.add(Builder::slm, SlmIndicator._DESERIALIZER, "slm");
 		op.add(Builder::shardsCapacity, ShardsCapacityIndicator._DESERIALIZER, "shards_capacity");
-		op.add(Builder::fileSettings, FileSettingsIndicator._DESERIALIZER, "file_settings");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html b/java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html
index 38ab7e139..96c4b13a0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html
@@ -56,39 +56,37 @@
 '_global.get_script_languages.Response': '_global/get_script_languages/GetScriptLanguagesResponse.ts#L22-L27',
 '_global.get_source.Request': '_global/get_source/SourceRequest.ts#L31-L89',
 '_global.get_source.Response': '_global/get_source/SourceResponse.ts#L20-L23',
-'_global.health_report.BaseIndicator': '_global/health_report/types.ts#L44-L49',
-'_global.health_report.DataStreamLifecycleDetails': '_global/health_report/types.ts#L153-L157',
-'_global.health_report.DataStreamLifecycleIndicator': '_global/health_report/types.ts#L148-L152',
-'_global.health_report.Diagnosis': '_global/health_report/types.ts#L51-L57',
-'_global.health_report.DiagnosisAffectedResources': '_global/health_report/types.ts#L59-L65',
-'_global.health_report.DiskIndicator': '_global/health_report/types.ts#L124-L128',
-'_global.health_report.DiskIndicatorDetails': '_global/health_report/types.ts#L129-L135',
-'_global.health_report.FileSettingsIndicator': '_global/health_report/types.ts#L207-L211',
-'_global.health_report.FileSettingsIndicatorDetails': '_global/health_report/types.ts#L213-L216',
-'_global.health_report.IlmIndicator': '_global/health_report/types.ts#L164-L168',
-'_global.health_report.IlmIndicatorDetails': '_global/health_report/types.ts#L169-L173',
-'_global.health_report.Impact': '_global/health_report/types.ts#L67-L72',
-'_global.health_report.ImpactArea': '_global/health_report/types.ts#L74-L79',
+'_global.health_report.BaseIndicator': '_global/health_report/types.ts#L43-L48',
+'_global.health_report.DataStreamLifecycleDetails': '_global/health_report/types.ts#L152-L156',
+'_global.health_report.DataStreamLifecycleIndicator': '_global/health_report/types.ts#L147-L151',
+'_global.health_report.Diagnosis': '_global/health_report/types.ts#L50-L56',
+'_global.health_report.DiagnosisAffectedResources': '_global/health_report/types.ts#L58-L64',
+'_global.health_report.DiskIndicator': '_global/health_report/types.ts#L123-L127',
+'_global.health_report.DiskIndicatorDetails': '_global/health_report/types.ts#L128-L134',
+'_global.health_report.IlmIndicator': '_global/health_report/types.ts#L163-L167',
+'_global.health_report.IlmIndicatorDetails': '_global/health_report/types.ts#L168-L172',
+'_global.health_report.Impact': '_global/health_report/types.ts#L66-L71',
+'_global.health_report.ImpactArea': '_global/health_report/types.ts#L73-L78',
 '_global.health_report.IndicatorHealthStatus': '_global/health_report/types.ts#L25-L30',
-'_global.health_report.IndicatorNode': '_global/health_report/types.ts#L92-L95',
-'_global.health_report.Indicators': '_global/health_report/types.ts#L32-L42',
-'_global.health_report.MasterIsStableIndicator': '_global/health_report/types.ts#L81-L85',
-'_global.health_report.MasterIsStableIndicatorClusterFormationNode': '_global/health_report/types.ts#L100-L104',
-'_global.health_report.MasterIsStableIndicatorDetails': '_global/health_report/types.ts#L86-L91',
-'_global.health_report.MasterIsStableIndicatorExceptionFetchingHistory': '_global/health_report/types.ts#L96-L99',
-'_global.health_report.RepositoryIntegrityIndicator': '_global/health_report/types.ts#L137-L141',
-'_global.health_report.RepositoryIntegrityIndicatorDetails': '_global/health_report/types.ts#L142-L146',
+'_global.health_report.IndicatorNode': '_global/health_report/types.ts#L91-L94',
+'_global.health_report.Indicators': '_global/health_report/types.ts#L32-L41',
+'_global.health_report.MasterIsStableIndicator': '_global/health_report/types.ts#L80-L84',
+'_global.health_report.MasterIsStableIndicatorClusterFormationNode': '_global/health_report/types.ts#L99-L103',
+'_global.health_report.MasterIsStableIndicatorDetails': '_global/health_report/types.ts#L85-L90',
+'_global.health_report.MasterIsStableIndicatorExceptionFetchingHistory': '_global/health_report/types.ts#L95-L98',
+'_global.health_report.RepositoryIntegrityIndicator': '_global/health_report/types.ts#L136-L140',
+'_global.health_report.RepositoryIntegrityIndicatorDetails': '_global/health_report/types.ts#L141-L145',
 '_global.health_report.Request': '_global/health_report/Request.ts#L24-L70',
 '_global.health_report.Response': '_global/health_report/Response.ts#L22-L28',
-'_global.health_report.ShardsAvailabilityIndicator': '_global/health_report/types.ts#L106-L110',
-'_global.health_report.ShardsAvailabilityIndicatorDetails': '_global/health_report/types.ts#L111-L122',
-'_global.health_report.ShardsCapacityIndicator': '_global/health_report/types.ts#L191-L195',
-'_global.health_report.ShardsCapacityIndicatorDetails': '_global/health_report/types.ts#L197-L200',
-'_global.health_report.ShardsCapacityIndicatorTierDetail': '_global/health_report/types.ts#L202-L205',
-'_global.health_report.SlmIndicator': '_global/health_report/types.ts#L175-L179',
-'_global.health_report.SlmIndicatorDetails': '_global/health_report/types.ts#L180-L184',
-'_global.health_report.SlmIndicatorUnhealthyPolicies': '_global/health_report/types.ts#L186-L189',
-'_global.health_report.StagnatingBackingIndices': '_global/health_report/types.ts#L158-L162',
+'_global.health_report.ShardsAvailabilityIndicator': '_global/health_report/types.ts#L105-L109',
+'_global.health_report.ShardsAvailabilityIndicatorDetails': '_global/health_report/types.ts#L110-L121',
+'_global.health_report.ShardsCapacityIndicator': '_global/health_report/types.ts#L190-L194',
+'_global.health_report.ShardsCapacityIndicatorDetails': '_global/health_report/types.ts#L196-L199',
+'_global.health_report.ShardsCapacityIndicatorTierDetail': '_global/health_report/types.ts#L201-L204',
+'_global.health_report.SlmIndicator': '_global/health_report/types.ts#L174-L178',
+'_global.health_report.SlmIndicatorDetails': '_global/health_report/types.ts#L179-L183',
+'_global.health_report.SlmIndicatorUnhealthyPolicies': '_global/health_report/types.ts#L185-L188',
+'_global.health_report.StagnatingBackingIndices': '_global/health_report/types.ts#L157-L161',
 '_global.index.Request': '_global/index/IndexRequest.ts#L35-L119',
 '_global.index.Response': '_global/index/IndexResponse.ts#L22-L24',
 '_global.info.Request': '_global/info/RootNodeInfoRequest.ts#L22-L29',
@@ -154,7 +152,7 @@
 '_global.scripts_painless_execute.Response': '_global/scripts_painless_execute/ExecutePainlessScriptResponse.ts#L20-L24',
 '_global.scroll.Request': '_global/scroll/ScrollRequest.ts#L24-L75',
 '_global.scroll.Response': '_global/scroll/ScrollResponse.ts#L22-L24',
-'_global.search.Request': '_global/search/SearchRequest.ts#L53-L525',
+'_global.search.Request': '_global/search/SearchRequest.ts#L54-L531',
 '_global.search.Response': '_global/search/SearchResponse.ts#L34-L36',
 '_global.search.ResponseBody': '_global/search/SearchResponse.ts#L38-L54',
 '_global.search._types.AggregationBreakdown': '_global/search/_types/profile.ts#L26-L39',
@@ -784,7 +782,7 @@
 '_types.analysis.WhitespaceTokenizer': '_types/analysis/tokenizers.ts#L135-L138',
 '_types.analysis.WordDelimiterGraphTokenFilter': '_types/analysis/token_filters.ts#L150-L167',
 '_types.analysis.WordDelimiterTokenFilter': '_types/analysis/token_filters.ts#L133-L148',
-'_types.mapping.AggregateMetricDoubleProperty': '_types/mapping/complex.ts#L51-L56',
+'_types.mapping.AggregateMetricDoubleProperty': '_types/mapping/complex.ts#L61-L66',
 '_types.mapping.AllField': '_types/mapping/meta-fields.ts#L29-L40',
 '_types.mapping.BinaryProperty': '_types/mapping/core.ts#L54-L56',
 '_types.mapping.BooleanProperty': '_types/mapping/core.ts#L58-L64',
@@ -797,11 +795,8 @@
 '_types.mapping.DateNanosProperty': '_types/mapping/core.ts#L78-L86',
 '_types.mapping.DateProperty': '_types/mapping/core.ts#L66-L76',
 '_types.mapping.DateRangeProperty': '_types/mapping/range.ts#L29-L32',
-'_types.mapping.DenseVectorElementType': '_types/mapping/DenseVectorProperty.ts#L64-L80',
-'_types.mapping.DenseVectorIndexOptions': '_types/mapping/DenseVectorProperty.ts#L129-L162',
-'_types.mapping.DenseVectorIndexOptionsType': '_types/mapping/DenseVectorProperty.ts#L164-L197',
-'_types.mapping.DenseVectorProperty': '_types/mapping/DenseVectorProperty.ts#L23-L62',
-'_types.mapping.DenseVectorSimilarity': '_types/mapping/DenseVectorProperty.ts#L82-L127',
+'_types.mapping.DenseVectorIndexOptions': '_types/mapping/DenseVectorIndexOptions.ts#L22-L27',
+'_types.mapping.DenseVectorProperty': '_types/mapping/complex.ts#L52-L59',
 '_types.mapping.DocValuesPropertyBase': '_types/mapping/core.ts#L50-L52',
 '_types.mapping.DoubleNumberProperty': '_types/mapping/core.ts#L152-L155',
 '_types.mapping.DoubleRangeProperty': '_types/mapping/range.ts#L34-L36',
@@ -812,7 +807,7 @@
 '_types.mapping.FieldMapping': '_types/mapping/meta-fields.ts#L24-L27',
 '_types.mapping.FieldNamesField': '_types/mapping/meta-fields.ts#L42-L44',
 '_types.mapping.FieldType': '_types/mapping/Property.ts#L166-L213',
-'_types.mapping.FlattenedProperty': '_types/mapping/complex.ts#L25-L36',
+'_types.mapping.FlattenedProperty': '_types/mapping/complex.ts#L26-L37',
 '_types.mapping.FloatNumberProperty': '_types/mapping/core.ts#L142-L145',
 '_types.mapping.FloatRangeProperty': '_types/mapping/range.ts#L38-L40',
 '_types.mapping.GeoOrientation': '_types/mapping/geo.ts#L34-L39',
@@ -835,9 +830,9 @@
 '_types.mapping.MatchOnlyTextProperty': '_types/mapping/core.ts#L231-L256',
 '_types.mapping.MatchType': '_types/mapping/dynamic-template.ts#L44-L47',
 '_types.mapping.Murmur3HashProperty': '_types/mapping/specialized.ts#L81-L83',
-'_types.mapping.NestedProperty': '_types/mapping/complex.ts#L38-L43',
+'_types.mapping.NestedProperty': '_types/mapping/complex.ts#L39-L44',
 '_types.mapping.NumberPropertyBase': '_types/mapping/core.ts#L115-L135',
-'_types.mapping.ObjectProperty': '_types/mapping/complex.ts#L45-L49',
+'_types.mapping.ObjectProperty': '_types/mapping/complex.ts#L46-L50',
 '_types.mapping.OnScriptError': '_types/mapping/core.ts#L137-L140',
 '_types.mapping.PercolatorProperty': '_types/mapping/core.ts#L188-L190',
 '_types.mapping.PointProperty': '_types/mapping/geo.ts#L66-L71',
@@ -999,7 +994,7 @@
 'async_search.status.Request': 'async_search/status/AsyncSearchStatusRequest.ts#L24-L48',
 'async_search.status.Response': 'async_search/status/AsyncSearchStatusResponse.ts#L39-L41',
 'async_search.status.StatusResponseBase': 'async_search/status/AsyncSearchStatusResponse.ts#L24-L38',
-'async_search.submit.Request': 'async_search/submit/AsyncSearchSubmitRequest.ts#L54-L278',
+'async_search.submit.Request': 'async_search/submit/AsyncSearchSubmitRequest.ts#L55-L280',
 'async_search.submit.Response': 'async_search/submit/AsyncSearchSubmitResponse.ts#L22-L24',
 'autoscaling._types.AutoscalingPolicy': 'autoscaling/_types/AutoscalingPolicy.ts#L23-L30',
 'autoscaling.delete_autoscaling_policy.Request': 'autoscaling/delete_autoscaling_policy/DeleteAutoscalingPolicyRequest.ts#L24-L48',
@@ -1022,31 +1017,30 @@
 'cat._types.CatTrainedModelsColumn': 'cat/_types/CatBase.ts#L561-L635',
 'cat._types.CatTransformColumn': 'cat/_types/CatBase.ts#L640-L844',
 'cat.aliases.AliasesRecord': 'cat/aliases/types.ts#L22-L53',
-'cat.aliases.Request': 'cat/aliases/CatAliasesRequest.ts#L23-L43',
+'cat.aliases.Request': 'cat/aliases/CatAliasesRequest.ts#L24-L57',
 'cat.aliases.Response': 'cat/aliases/CatAliasesResponse.ts#L22-L24',
 'cat.allocation.AllocationRecord': 'cat/allocation/types.ts#L25-L99',
-'cat.allocation.Request': 'cat/allocation/CatAllocationRequest.ts#L23-L50',
+'cat.allocation.Request': 'cat/allocation/CatAllocationRequest.ts#L24-L55',
 'cat.allocation.Response': 'cat/allocation/CatAllocationResponse.ts#L22-L24',
 'cat.component_templates.ComponentTemplate': 'cat/component_templates/types.ts#L20-L28',
-'cat.component_templates.Request': 'cat/component_templates/CatComponentTemplatesRequest.ts#L22-L49',
+'cat.component_templates.Request': 'cat/component_templates/CatComponentTemplatesRequest.ts#L23-L55',
 'cat.component_templates.Response': 'cat/component_templates/CatComponentTemplatesResponse.ts#L22-L24',
 'cat.count.CountRecord': 'cat/count/types.ts#L23-L39',
 'cat.count.Request': 'cat/count/CatCountRequest.ts#L23-L44',
 'cat.count.Response': 'cat/count/CatCountResponse.ts#L22-L24',
 'cat.fielddata.FielddataRecord': 'cat/fielddata/types.ts#L20-L48',
-'cat.fielddata.Request': 'cat/fielddata/CatFielddataRequest.ts#L23-L48',
+'cat.fielddata.Request': 'cat/fielddata/CatFielddataRequest.ts#L23-L47',
 'cat.fielddata.Response': 'cat/fielddata/CatFielddataResponse.ts#L22-L24',
 'cat.health.HealthRecord': 'cat/health/types.ts#L23-L99',
 'cat.health.Request': 'cat/health/CatHealthRequest.ts#L23-L52',
 'cat.health.Response': 'cat/health/CatHealthResponse.ts#L22-L24',
-'cat.help.HelpRecord': 'cat/help/types.ts#L20-L22',
-'cat.help.Request': 'cat/help/CatHelpRequest.ts#L22-L30',
-'cat.help.Response': 'cat/help/CatHelpResponse.ts#L22-L24',
+'cat.help.Request': 'cat/help/CatHelpRequest.ts#L20-L28',
+'cat.help.Response': 'cat/help/CatHelpResponse.ts#L20-L25',
 'cat.indices.IndicesRecord': 'cat/indices/types.ts#L20-L808',
-'cat.indices.Request': 'cat/indices/CatIndicesRequest.ts#L24-L77',
+'cat.indices.Request': 'cat/indices/CatIndicesRequest.ts#L24-L82',
 'cat.indices.Response': 'cat/indices/CatIndicesResponse.ts#L22-L24',
 'cat.master.MasterRecord': 'cat/master/types.ts#L20-L39',
-'cat.master.Request': 'cat/master/CatMasterRequest.ts#L22-L43',
+'cat.master.Request': 'cat/master/CatMasterRequest.ts#L23-L48',
 'cat.master.Response': 'cat/master/CatMasterResponse.ts#L22-L24',
 'cat.ml_data_frame_analytics.DataFrameAnalyticsRecord': 'cat/ml_data_frame_analytics/types.ts#L22-L102',
 'cat.ml_data_frame_analytics.Request': 'cat/ml_data_frame_analytics/CatDataFrameAnalyticsRequest.ts#L24-L59',
@@ -1057,43 +1051,43 @@
 'cat.ml_jobs.JobsRecord': 'cat/ml_jobs/types.ts#L24-L347',
 'cat.ml_jobs.Request': 'cat/ml_jobs/CatJobsRequest.ts#L24-L78',
 'cat.ml_jobs.Response': 'cat/ml_jobs/CatJobsResponse.ts#L22-L24',
-'cat.ml_trained_models.Request': 'cat/ml_trained_models/CatTrainedModelsRequest.ts#L24-L64',
+'cat.ml_trained_models.Request': 'cat/ml_trained_models/CatTrainedModelsRequest.ts#L25-L69',
 'cat.ml_trained_models.Response': 'cat/ml_trained_models/CatTrainedModelsResponse.ts#L22-L24',
 'cat.ml_trained_models.TrainedModelsRecord': 'cat/ml_trained_models/types.ts#L23-L115',
 'cat.nodeattrs.NodeAttributesRecord': 'cat/nodeattrs/types.ts#L20-L55',
-'cat.nodeattrs.Request': 'cat/nodeattrs/CatNodeAttributesRequest.ts#L22-L43',
+'cat.nodeattrs.Request': 'cat/nodeattrs/CatNodeAttributesRequest.ts#L23-L48',
 'cat.nodeattrs.Response': 'cat/nodeattrs/CatNodeAttributesResponse.ts#L22-L24',
 'cat.nodes.NodesRecord': 'cat/nodes/types.ts#L23-L542',
-'cat.nodes.Request': 'cat/nodes/CatNodesRequest.ts#L23-L50',
+'cat.nodes.Request': 'cat/nodes/CatNodesRequest.ts#L24-L59',
 'cat.nodes.Response': 'cat/nodes/CatNodesResponse.ts#L22-L24',
 'cat.pending_tasks.PendingTasksRecord': 'cat/pending_tasks/types.ts#L20-L41',
-'cat.pending_tasks.Request': 'cat/pending_tasks/CatPendingTasksRequest.ts#L22-L43',
+'cat.pending_tasks.Request': 'cat/pending_tasks/CatPendingTasksRequest.ts#L23-L52',
 'cat.pending_tasks.Response': 'cat/pending_tasks/CatPendingTasksResponse.ts#L22-L24',
 'cat.plugins.PluginsRecord': 'cat/plugins/types.ts#L22-L52',
-'cat.plugins.Request': 'cat/plugins/CatPluginsRequest.ts#L22-L43',
+'cat.plugins.Request': 'cat/plugins/CatPluginsRequest.ts#L23-L53',
 'cat.plugins.Response': 'cat/plugins/CatPluginsResponse.ts#L22-L24',
 'cat.recovery.RecoveryRecord': 'cat/recovery/types.ts#L24-L155',
-'cat.recovery.Request': 'cat/recovery/CatRecoveryRequest.ts#L23-L60',
+'cat.recovery.Request': 'cat/recovery/CatRecoveryRequest.ts#L24-L64',
 'cat.recovery.Response': 'cat/recovery/CatRecoveryResponse.ts#L22-L24',
 'cat.repositories.RepositoriesRecord': 'cat/repositories/types.ts#L20-L31',
-'cat.repositories.Request': 'cat/repositories/CatRepositoriesRequest.ts#L22-L32',
+'cat.repositories.Request': 'cat/repositories/CatRepositoriesRequest.ts#L23-L48',
 'cat.repositories.Response': 'cat/repositories/CatRepositoriesResponse.ts#L22-L24',
-'cat.segments.Request': 'cat/segments/CatSegmentsRequest.ts#L23-L58',
+'cat.segments.Request': 'cat/segments/CatSegmentsRequest.ts#L24-L63',
 'cat.segments.Response': 'cat/segments/CatSegmentsResponse.ts#L22-L24',
 'cat.segments.SegmentsRecord': 'cat/segments/types.ts#L22-L107',
-'cat.shards.Request': 'cat/shards/CatShardsRequest.ts#L23-L50',
+'cat.shards.Request': 'cat/shards/CatShardsRequest.ts#L24-L59',
 'cat.shards.Response': 'cat/shards/CatShardsResponse.ts#L22-L24',
 'cat.shards.ShardsRecord': 'cat/shards/types.ts#L20-L427',
-'cat.snapshots.Request': 'cat/snapshots/CatSnapshotsRequest.ts#L23-L51',
+'cat.snapshots.Request': 'cat/snapshots/CatSnapshotsRequest.ts#L24-L60',
 'cat.snapshots.Response': 'cat/snapshots/CatSnapshotsResponse.ts#L22-L24',
 'cat.snapshots.SnapshotsRecord': 'cat/snapshots/types.ts#L24-L96',
-'cat.tasks.Request': 'cat/tasks/CatTasksRequest.ts#L22-L48',
+'cat.tasks.Request': 'cat/tasks/CatTasksRequest.ts#L23-L63',
 'cat.tasks.Response': 'cat/tasks/CatTasksResponse.ts#L22-L24',
 'cat.tasks.TasksRecord': 'cat/tasks/types.ts#L22-L101',
-'cat.templates.Request': 'cat/templates/CatTemplatesRequest.ts#L23-L52',
+'cat.templates.Request': 'cat/templates/CatTemplatesRequest.ts#L24-L57',
 'cat.templates.Response': 'cat/templates/CatTemplatesResponse.ts#L22-L24',
 'cat.templates.TemplatesRecord': 'cat/templates/types.ts#L22-L48',
-'cat.thread_pool.Request': 'cat/thread_pool/CatThreadPoolRequest.ts#L24-L57',
+'cat.thread_pool.Request': 'cat/thread_pool/CatThreadPoolRequest.ts#L24-L61',
 'cat.thread_pool.Response': 'cat/thread_pool/CatThreadPoolResponse.ts#L22-L24',
 'cat.thread_pool.ThreadPoolRecord': 'cat/thread_pool/types.ts#L22-L124',
 'cat.transforms.Request': 'cat/transforms/CatTransformsRequest.ts#L25-L78',
@@ -1104,10 +1098,10 @@
 'ccr._types.ShardStats': 'ccr/_types/FollowIndexStats.ts#L35-L69',
 'ccr.delete_auto_follow_pattern.Request': 'ccr/delete_auto_follow_pattern/DeleteAutoFollowPatternRequest.ts#L23-L35',
 'ccr.delete_auto_follow_pattern.Response': 'ccr/delete_auto_follow_pattern/DeleteAutoFollowPatternResponse.ts#L22-L24',
-'ccr.follow.Request': 'ccr/follow/CreateFollowIndexRequest.ts#L26-L113',
+'ccr.follow.Request': 'ccr/follow/CreateFollowIndexRequest.ts#L25-L54',
 'ccr.follow.Response': 'ccr/follow/CreateFollowIndexResponse.ts#L20-L26',
 'ccr.follow_info.FollowerIndex': 'ccr/follow_info/types.ts#L24-L30',
-'ccr.follow_info.FollowerIndexParameters': 'ccr/follow_info/types.ts#L37-L83',
+'ccr.follow_info.FollowerIndexParameters': 'ccr/follow_info/types.ts#L37-L48',
 'ccr.follow_info.FollowerIndexStatus': 'ccr/follow_info/types.ts#L32-L35',
 'ccr.follow_info.Request': 'ccr/follow_info/FollowInfoRequest.ts#L23-L36',
 'ccr.follow_info.Response': 'ccr/follow_info/FollowInfoResponse.ts#L22-L24',
@@ -1344,7 +1338,7 @@
 'eql.get.Response': 'eql/get/EqlGetResponse.ts#L22-L24',
 'eql.get_status.Request': 'eql/get_status/EqlGetStatusRequest.ts#L23-L36',
 'eql.get_status.Response': 'eql/get_status/EqlGetStatusResponse.ts#L24-L51',
-'eql.search.Request': 'eql/search/EqlSearchRequest.ts#L28-L129',
+'eql.search.Request': 'eql/search/EqlSearchRequest.ts#L28-L122',
 'eql.search.Response': 'eql/search/EqlSearchResponse.ts#L22-L24',
 'eql.search.ResultPosition': 'eql/search/types.ts#L20-L32',
 'esql._types.TableValuesContainer': 'esql/_types/TableValuesContainer.ts#L22-L28',
@@ -1356,7 +1350,7 @@
 'features.get_features.Response': 'features/get_features/GetFeaturesResponse.ts#L22-L26',
 'features.reset_features.Request': 'features/reset_features/ResetFeaturesRequest.ts#L22-L44',
 'features.reset_features.Response': 'features/reset_features/ResetFeaturesResponse.ts#L22-L26',
-'fleet.search.Request': 'fleet/search/SearchRequest.ts#L54-L259',
+'fleet.search.Request': 'fleet/search/SearchRequest.ts#L55-L260',
 'fleet.search.Response': 'fleet/search/SearchResponse.ts#L33-L50',
 'graph._types.Connection': 'graph/_types/Connection.ts#L22-L27',
 'graph._types.ExploreControls': 'graph/_types/ExploreControls.ts#L24-L49',
@@ -1414,10 +1408,10 @@
 'indices._types.CacheQueries': 'indices/_types/IndexSettings.ts#L407-L409',
 'indices._types.DataStream': 'indices/_types/DataStream.ts#L45-L127',
 'indices._types.DataStreamIndex': 'indices/_types/DataStream.ts#L136-L157',
-'indices._types.DataStreamLifecycle': 'indices/_types/DataStreamLifecycle.ts#L25-L45',
+'indices._types.DataStreamLifecycle': 'indices/_types/DataStreamLifecycle.ts#L25-L31',
 'indices._types.DataStreamLifecycleDownsampling': 'indices/_types/DataStreamLifecycleDownsampling.ts#L22-L27',
-'indices._types.DataStreamLifecycleRolloverConditions': 'indices/_types/DataStreamLifecycle.ts#L60-L72',
-'indices._types.DataStreamLifecycleWithRollover': 'indices/_types/DataStreamLifecycle.ts#L47-L58',
+'indices._types.DataStreamLifecycleRolloverConditions': 'indices/_types/DataStreamLifecycle.ts#L57-L69',
+'indices._types.DataStreamLifecycleWithRollover': 'indices/_types/DataStreamLifecycle.ts#L33-L55',
 'indices._types.DataStreamTimestampField': 'indices/_types/DataStream.ts#L129-L134',
 'indices._types.DataStreamVisibility': 'indices/_types/DataStream.ts#L159-L162',
 'indices._types.DownsampleConfig': 'indices/_types/Downsample.ts#L22-L27',
@@ -1534,7 +1528,7 @@
 'indices.downsample.Request': 'indices/downsample/Request.ts#L24-L51',
 'indices.downsample.Response': 'indices/downsample/Response.ts#L22-L25',
 'indices.exists.Request': 'indices/exists/IndicesExistsRequest.ts#L23-L73',
-'indices.exists_alias.Request': 'indices/exists_alias/IndicesExistsAliasRequest.ts#L24-L70',
+'indices.exists_alias.Request': 'indices/exists_alias/IndicesExistsAliasRequest.ts#L23-L69',
 'indices.exists_index_template.Request': 'indices/exists_index_template/IndicesExistsIndexTemplateRequest.ts#L24-L43',
 'indices.exists_template.Request': 'indices/exists_template/IndicesExistsTemplateRequest.ts#L24-L39',
 'indices.explain_data_lifecycle.DataStreamLifecycleExplain': 'indices/explain_data_lifecycle/IndicesExplainDataLifecycleResponse.ts#L31-L41',
@@ -1557,7 +1551,7 @@
 'indices.get.Request': 'indices/get/IndicesGetRequest.ts#L24-L89',
 'indices.get.Response': 'indices/get/IndicesGetResponse.ts#L24-L27',
 'indices.get_alias.IndexAliases': 'indices/get_alias/IndicesGetAliasResponse.ts#L37-L39',
-'indices.get_alias.Request': 'indices/get_alias/IndicesGetAliasRequest.ts#L24-L73',
+'indices.get_alias.Request': 'indices/get_alias/IndicesGetAliasRequest.ts#L23-L72',
 'indices.get_alias.Response': 'indices/get_alias/IndicesGetAliasResponse.ts#L26-L35',
 'indices.get_data_lifecycle.DataStreamWithLifecycle': 'indices/get_data_lifecycle/IndicesGetDataLifecycleResponse.ts#L27-L30',
 'indices.get_data_lifecycle.Request': 'indices/get_data_lifecycle/IndicesGetDataLifecycleRequest.ts#L24-L60',
@@ -1589,7 +1583,7 @@
 'indices.promote_data_stream.Response': 'indices/promote_data_stream/IndicesPromoteDataStreamResponse.ts#L22-L25',
 'indices.put_alias.Request': 'indices/put_alias/IndicesPutAliasRequest.ts#L25-L92',
 'indices.put_alias.Response': 'indices/put_alias/IndicesPutAliasResponse.ts#L22-L24',
-'indices.put_data_lifecycle.Request': 'indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts#L25-L67',
+'indices.put_data_lifecycle.Request': 'indices/put_data_lifecycle/IndicesPutDataLifecycleRequest.ts#L25-L76',
 'indices.put_data_lifecycle.Response': 'indices/put_data_lifecycle/IndicesPutDataLifecycleResponse.ts#L22-L24',
 'indices.put_index_template.IndexTemplateMapping': 'indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L121-L143',
 'indices.put_index_template.Request': 'indices/put_index_template/IndicesPutIndexTemplateRequest.ts#L37-L119',
@@ -1598,7 +1592,7 @@
 'indices.put_mapping.Response': 'indices/put_mapping/IndicesPutMappingResponse.ts#L22-L24',
 'indices.put_settings.Request': 'indices/put_settings/IndicesPutSettingsRequest.ts#L25-L93',
 'indices.put_settings.Response': 'indices/put_settings/IndicesPutSettingsResponse.ts#L22-L24',
-'indices.put_template.Request': 'indices/put_template/IndicesPutTemplateRequest.ts#L29-L106',
+'indices.put_template.Request': 'indices/put_template/IndicesPutTemplateRequest.ts#L29-L107',
 'indices.put_template.Response': 'indices/put_template/IndicesPutTemplateResponse.ts#L22-L24',
 'indices.recovery.FileDetails': 'indices/recovery/types.ts#L50-L54',
 'indices.recovery.RecoveryBytes': 'indices/recovery/types.ts#L38-L48',
@@ -1630,7 +1624,7 @@
 'indices.rollover.Response': 'indices/rollover/IndicesRolloverResponse.ts#L22-L32',
 'indices.rollover.RolloverConditions': 'indices/rollover/types.ts#L24-L40',
 'indices.segments.IndexSegment': 'indices/segments/types.ts#L24-L26',
-'indices.segments.Request': 'indices/segments/IndicesSegmentsRequest.ts#L23-L61',
+'indices.segments.Request': 'indices/segments/IndicesSegmentsRequest.ts#L23-L66',
 'indices.segments.Response': 'indices/segments/IndicesSegmentsResponse.ts#L24-L29',
 'indices.segments.Segment': 'indices/segments/types.ts#L28-L38',
 'indices.segments.ShardSegmentRouting': 'indices/segments/types.ts#L40-L44',
@@ -1698,7 +1692,7 @@
 'inference.get.Response': 'inference/get/GetResponse.ts#L22-L26',
 'inference.inference.Request': 'inference/inference/InferenceRequest.ts#L26-L66',
 'inference.inference.Response': 'inference/inference/InferenceResponse.ts#L22-L24',
-'inference.put.Request': 'inference/put/PutRequest.ts#L25-L54',
+'inference.put.Request': 'inference/put/PutRequest.ts#L25-L44',
 'inference.put.Response': 'inference/put/PutResponse.ts#L22-L24',
 'ingest._types.AppendProcessor': 'ingest/_types/Processors.ts#L328-L343',
 'ingest._types.AttachmentProcessor': 'ingest/_types/Processors.ts#L345-L386',
@@ -1708,7 +1702,8 @@
 'ingest._types.ConvertProcessor': 'ingest/_types/Processors.ts#L672-L692',
 'ingest._types.ConvertType': 'ingest/_types/Processors.ts#L661-L670',
 'ingest._types.CsvProcessor': 'ingest/_types/Processors.ts#L694-L727',
-'ingest._types.DatabaseConfiguration': 'ingest/_types/Database.ts#L22-L29',
+'ingest._types.DatabaseConfiguration': 'ingest/_types/Database.ts#L22-L37',
+'ingest._types.DatabaseConfigurationFull': 'ingest/_types/Database.ts#L39-L53',
 'ingest._types.DateIndexNameProcessor': 'ingest/_types/Processors.ts#L729-L767',
 'ingest._types.DateProcessor': 'ingest/_types/Processors.ts#L769-L802',
 'ingest._types.DissectProcessor': 'ingest/_types/Processors.ts#L804-L823',
@@ -1731,12 +1726,14 @@
 'ingest._types.InferenceConfigRegression': 'ingest/_types/Processors.ts#L1062-L1073',
 'ingest._types.InferenceProcessor': 'ingest/_types/Processors.ts#L1027-L1046',
 'ingest._types.IpLocationProcessor': 'ingest/_types/Processors.ts#L478-L512',
+'ingest._types.Ipinfo': 'ingest/_types/Database.ts#L59-L59',
 'ingest._types.JoinProcessor': 'ingest/_types/Processors.ts#L1103-L1118',
 'ingest._types.JsonProcessor': 'ingest/_types/Processors.ts#L1120-L1149',
 'ingest._types.JsonProcessorConflictStrategy': 'ingest/_types/Processors.ts#L1151-L1156',
 'ingest._types.KeyValueProcessor': 'ingest/_types/Processors.ts#L1158-L1210',
+'ingest._types.Local': 'ingest/_types/Database.ts#L63-L65',
 'ingest._types.LowercaseProcessor': 'ingest/_types/Processors.ts#L1212-L1228',
-'ingest._types.Maxmind': 'ingest/_types/Database.ts#L31-L33',
+'ingest._types.Maxmind': 'ingest/_types/Database.ts#L55-L57',
 'ingest._types.NetworkDirectionProcessor': 'ingest/_types/Processors.ts#L1230-L1264',
 'ingest._types.Pipeline': 'ingest/_types/Pipeline.ts#L23-L51',
 'ingest._types.PipelineProcessor': 'ingest/_types/Processors.ts#L1266-L1277',
@@ -1760,8 +1757,11 @@
 'ingest._types.UrlDecodeProcessor': 'ingest/_types/Processors.ts#L1561-L1577',
 'ingest._types.UserAgentProcessor': 'ingest/_types/Processors.ts#L514-L545',
 'ingest._types.UserAgentProperty': 'ingest/_types/Processors.ts#L547-L553',
+'ingest._types.Web': 'ingest/_types/Database.ts#L61-L61',
 'ingest.delete_geoip_database.Request': 'ingest/delete_geoip_database/DeleteGeoipDatabaseRequest.ts#L24-L49',
 'ingest.delete_geoip_database.Response': 'ingest/delete_geoip_database/DeleteGeoipDatabaseResponse.ts#L22-L24',
+'ingest.delete_ip_location_database.Request': 'ingest/delete_ip_location_database/DeleteIpLocationDatabaseRequest.ts#L24-L48',
+'ingest.delete_ip_location_database.Response': 'ingest/delete_ip_location_database/DeleteIpLocationDatabaseResponse.ts#L22-L24',
 'ingest.delete_pipeline.Request': 'ingest/delete_pipeline/DeletePipelineRequest.ts#L24-L54',
 'ingest.delete_pipeline.Response': 'ingest/delete_pipeline/DeletePipelineResponse.ts#L22-L24',
 'ingest.geo_ip_stats.GeoIpDownloadStatistics': 'ingest/geo_ip_stats/types.ts#L24-L37',
@@ -1772,12 +1772,17 @@
 'ingest.get_geoip_database.DatabaseConfigurationMetadata': 'ingest/get_geoip_database/GetGeoipDatabaseResponse.ts#L29-L34',
 'ingest.get_geoip_database.Request': 'ingest/get_geoip_database/GetGeoipDatabaseRequest.ts#L24-L47',
 'ingest.get_geoip_database.Response': 'ingest/get_geoip_database/GetGeoipDatabaseResponse.ts#L25-L27',
+'ingest.get_ip_location_database.DatabaseConfigurationMetadata': 'ingest/get_ip_location_database/GetIpLocationDatabaseResponse.ts#L28-L34',
+'ingest.get_ip_location_database.Request': 'ingest/get_ip_location_database/GetIpLocationDatabaseRequest.ts#L24-L46',
+'ingest.get_ip_location_database.Response': 'ingest/get_ip_location_database/GetIpLocationDatabaseResponse.ts#L24-L26',
 'ingest.get_pipeline.Request': 'ingest/get_pipeline/GetPipelineRequest.ts#L24-L52',
 'ingest.get_pipeline.Response': 'ingest/get_pipeline/GetPipelineResponse.ts#L23-L26',
 'ingest.processor_grok.Request': 'ingest/processor_grok/GrokProcessorPatternsRequest.ts#L22-L33',
 'ingest.processor_grok.Response': 'ingest/processor_grok/GrokProcessorPatternsResponse.ts#L22-L24',
 'ingest.put_geoip_database.Request': 'ingest/put_geoip_database/PutGeoipDatabaseRequest.ts#L25-L58',
 'ingest.put_geoip_database.Response': 'ingest/put_geoip_database/PutGeoipDatabaseResponse.ts#L22-L24',
+'ingest.put_ip_location_database.Request': 'ingest/put_ip_location_database/PutIpLocationDatabaseRequest.ts#L25-L51',
+'ingest.put_ip_location_database.Response': 'ingest/put_ip_location_database/PutIpLocationDatabaseResponse.ts#L22-L24',
 'ingest.put_pipeline.Request': 'ingest/put_pipeline/PutPipelineRequest.ts#L25-L84',
 'ingest.put_pipeline.Response': 'ingest/put_pipeline/PutPipelineResponse.ts#L22-L24',
 'ingest.simulate.Document': 'ingest/simulate/types.ts#L62-L76',
@@ -1807,24 +1812,24 @@
 'license.post_start_basic.Response': 'license/post_start_basic/StartBasicLicenseResponse.ts#L23-L31',
 'license.post_start_trial.Request': 'license/post_start_trial/StartTrialLicenseRequest.ts#L22-L39',
 'license.post_start_trial.Response': 'license/post_start_trial/StartTrialLicenseResponse.ts#L22-L29',
-'logstash._types.Pipeline': 'logstash/_types/Pipeline.ts#L60-L91',
+'logstash._types.Pipeline': 'logstash/_types/Pipeline.ts#L60-L92',
 'logstash._types.PipelineMetadata': 'logstash/_types/Pipeline.ts#L23-L26',
 'logstash._types.PipelineSettings': 'logstash/_types/Pipeline.ts#L28-L59',
-'logstash.delete_pipeline.Request': 'logstash/delete_pipeline/LogstashDeletePipelineRequest.ts#L23-L40',
-'logstash.get_pipeline.Request': 'logstash/get_pipeline/LogstashGetPipelineRequest.ts#L23-L40',
+'logstash.delete_pipeline.Request': 'logstash/delete_pipeline/LogstashDeletePipelineRequest.ts#L23-L37',
+'logstash.get_pipeline.Request': 'logstash/get_pipeline/LogstashGetPipelineRequest.ts#L23-L37',
 'logstash.get_pipeline.Response': 'logstash/get_pipeline/LogstashGetPipelineResponse.ts#L24-L27',
-'logstash.put_pipeline.Request': 'logstash/put_pipeline/LogstashPutPipelineRequest.ts#L24-L44',
+'logstash.put_pipeline.Request': 'logstash/put_pipeline/LogstashPutPipelineRequest.ts#L24-L39',
 'migration.deprecations.Deprecation': 'migration/deprecations/types.ts#L32-L40',
 'migration.deprecations.DeprecationLevel': 'migration/deprecations/types.ts#L23-L30',
-'migration.deprecations.Request': 'migration/deprecations/DeprecationInfoRequest.ts#L23-L37',
+'migration.deprecations.Request': 'migration/deprecations/DeprecationInfoRequest.ts#L23-L32',
 'migration.deprecations.Response': 'migration/deprecations/DeprecationInfoResponse.ts#L23-L31',
 'migration.get_feature_upgrade_status.MigrationFeature': 'migration/get_feature_upgrade_status/GetFeatureUpgradeStatusResponse.ts#L37-L42',
 'migration.get_feature_upgrade_status.MigrationFeatureIndexInfo': 'migration/get_feature_upgrade_status/GetFeatureUpgradeStatusResponse.ts#L44-L48',
 'migration.get_feature_upgrade_status.MigrationStatus': 'migration/get_feature_upgrade_status/GetFeatureUpgradeStatusResponse.ts#L30-L35',
-'migration.get_feature_upgrade_status.Request': 'migration/get_feature_upgrade_status/GetFeatureUpgradeStatusRequest.ts#L22-L34',
+'migration.get_feature_upgrade_status.Request': 'migration/get_feature_upgrade_status/GetFeatureUpgradeStatusRequest.ts#L22-L27',
 'migration.get_feature_upgrade_status.Response': 'migration/get_feature_upgrade_status/GetFeatureUpgradeStatusResponse.ts#L23-L28',
 'migration.post_feature_upgrade.MigrationFeature': 'migration/post_feature_upgrade/PostFeatureUpgradeResponse.ts#L27-L29',
-'migration.post_feature_upgrade.Request': 'migration/post_feature_upgrade/PostFeatureUpgradeRequest.ts#L22-L35',
+'migration.post_feature_upgrade.Request': 'migration/post_feature_upgrade/PostFeatureUpgradeRequest.ts#L22-L27',
 'migration.post_feature_upgrade.Response': 'migration/post_feature_upgrade/PostFeatureUpgradeResponse.ts#L20-L25',
 'ml._types.AdaptiveAllocationsSettings': 'ml/_types/TrainedModel.ts#L109-L113',
 'ml._types.AnalysisConfig': 'ml/_types/Analysis.ts#L29-L77',
@@ -1838,7 +1843,7 @@
 'ml._types.AppliesTo': 'ml/_types/Rule.ts#L67-L72',
 'ml._types.BucketInfluencer': 'ml/_types/Bucket.ts#L79-L127',
 'ml._types.BucketSummary': 'ml/_types/Bucket.ts#L30-L77',
-'ml._types.CalendarEvent': 'ml/_types/CalendarEvent.ts#L24-L44',
+'ml._types.CalendarEvent': 'ml/_types/CalendarEvent.ts#L23-L33',
 'ml._types.CategorizationAnalyzer': 'ml/_types/Analysis.ts#L181-L182',
 'ml._types.CategorizationAnalyzerDefinition': 'ml/_types/Analysis.ts#L184-L198',
 'ml._types.CategorizationStatus': 'ml/_types/Model.ts#L84-L87',
@@ -2173,9 +2178,9 @@
 'ml.upgrade_job_snapshot.Response': 'ml/upgrade_job_snapshot/MlUpgradeJobSnapshotResponse.ts#L22-L31',
 'ml.validate.Request': 'ml/validate/MlValidateJobRequest.ts#L27-L44',
 'ml.validate.Response': 'ml/validate/MlValidateJobResponse.ts#L22-L24',
-'ml.validate_detector.Request': 'ml/validate_detector/MlValidateDetectorRequest.ts#L23-L33',
+'ml.validate_detector.Request': 'ml/validate_detector/MlValidateDetectorRequest.ts#L23-L31',
 'ml.validate_detector.Response': 'ml/validate_detector/MlValidateDetectorResponse.ts#L22-L24',
-'monitoring.bulk.Request': 'monitoring/bulk/BulkMonitoringRequest.ts#L24-L61',
+'monitoring.bulk.Request': 'monitoring/bulk/BulkMonitoringRequest.ts#L24-L59',
 'monitoring.bulk.Response': 'monitoring/bulk/BulkMonitoringResponse.ts#L23-L32',
 'nodes._types.AdaptiveSelection': 'nodes/_types/Stats.ts#L439-L468',
 'nodes._types.Breaker': 'nodes/_types/Stats.ts#L470-L495',
@@ -2338,38 +2343,37 @@
 'rollup._types.HistogramGrouping': 'rollup/_types/Groupings.ts#L84-L97',
 'rollup._types.Metric': 'rollup/_types/Metric.ts#L22-L28',
 'rollup._types.TermsGrouping': 'rollup/_types/Groupings.ts#L75-L82',
-'rollup.delete_job.Request': 'rollup/delete_job/DeleteRollupJobRequest.ts#L23-L59',
+'rollup.delete_job.Request': 'rollup/delete_job/DeleteRollupJobRequest.ts#L23-L35',
 'rollup.delete_job.Response': 'rollup/delete_job/DeleteRollupJobResponse.ts#L22-L27',
 'rollup.get_jobs.IndexingJobState': 'rollup/get_jobs/types.ts#L66-L72',
-'rollup.get_jobs.Request': 'rollup/get_jobs/GetRollupJobRequest.ts#L23-L42',
+'rollup.get_jobs.Request': 'rollup/get_jobs/GetRollupJobRequest.ts#L23-L36',
 'rollup.get_jobs.Response': 'rollup/get_jobs/GetRollupJobResponse.ts#L22-L24',
 'rollup.get_jobs.RollupJob': 'rollup/get_jobs/types.ts#L28-L32',
 'rollup.get_jobs.RollupJobConfiguration': 'rollup/get_jobs/types.ts#L34-L43',
 'rollup.get_jobs.RollupJobStats': 'rollup/get_jobs/types.ts#L45-L58',
 'rollup.get_jobs.RollupJobStatus': 'rollup/get_jobs/types.ts#L60-L64',
-'rollup.get_rollup_caps.Request': 'rollup/get_rollup_caps/GetRollupCapabilitiesRequest.ts#L23-L45',
+'rollup.get_rollup_caps.Request': 'rollup/get_rollup_caps/GetRollupCapabilitiesRequest.ts#L23-L36',
 'rollup.get_rollup_caps.Response': 'rollup/get_rollup_caps/GetRollupCapabilitiesResponse.ts#L24-L27',
 'rollup.get_rollup_caps.RollupCapabilities': 'rollup/get_rollup_caps/types.ts#L24-L26',
 'rollup.get_rollup_caps.RollupCapabilitySummary': 'rollup/get_rollup_caps/types.ts#L28-L33',
 'rollup.get_rollup_caps.RollupFieldSummary': 'rollup/get_rollup_caps/types.ts#L35-L39',
 'rollup.get_rollup_index_caps.IndexCapabilities': 'rollup/get_rollup_index_caps/types.ts#L24-L26',
-'rollup.get_rollup_index_caps.Request': 'rollup/get_rollup_index_caps/GetRollupIndexCapabilitiesRequest.ts#L23-L42',
+'rollup.get_rollup_index_caps.Request': 'rollup/get_rollup_index_caps/GetRollupIndexCapabilitiesRequest.ts#L23-L36',
 'rollup.get_rollup_index_caps.Response': 'rollup/get_rollup_index_caps/GetRollupIndexCapabilitiesResponse.ts#L24-L27',
 'rollup.get_rollup_index_caps.RollupJobSummary': 'rollup/get_rollup_index_caps/types.ts#L28-L33',
 'rollup.get_rollup_index_caps.RollupJobSummaryField': 'rollup/get_rollup_index_caps/types.ts#L35-L39',
-'rollup.put_job.Request': 'rollup/put_job/CreateRollupJobRequest.ts#L27-L97',
+'rollup.put_job.Request': 'rollup/put_job/CreateRollupJobRequest.ts#L27-L89',
 'rollup.put_job.Response': 'rollup/put_job/CreateRollupJobResponse.ts#L22-L24',
-'rollup.rollup_search.Request': 'rollup/rollup_search/RollupSearchRequest.ts#L27-L59',
+'rollup.rollup_search.Request': 'rollup/rollup_search/RollupSearchRequest.ts#L27-L57',
 'rollup.rollup_search.Response': 'rollup/rollup_search/RollupSearchResponse.ts#L27-L36',
-'rollup.start_job.Request': 'rollup/start_job/StartRollupJobRequest.ts#L23-L38',
+'rollup.start_job.Request': 'rollup/start_job/StartRollupJobRequest.ts#L23-L35',
 'rollup.start_job.Response': 'rollup/start_job/StartRollupJobResponse.ts#L20-L22',
-'rollup.stop_job.Request': 'rollup/stop_job/StopRollupJobRequest.ts#L24-L53',
+'rollup.stop_job.Request': 'rollup/stop_job/StopRollupJobRequest.ts#L24-L50',
 'rollup.stop_job.Response': 'rollup/stop_job/StopRollupJobResponse.ts#L20-L22',
 'search_application._types.AnalyticsCollection': 'search_application/_types/BehavioralAnalytics.ts#L22-L27',
 'search_application._types.EventDataStream': 'search_application/_types/BehavioralAnalytics.ts#L29-L31',
-'search_application._types.SearchApplication': 'search_application/_types/SearchApplication.ts#L24-L33',
-'search_application._types.SearchApplicationParameters': 'search_application/_types/SearchApplicationParameters.ts#L23-L36',
-'search_application._types.SearchApplicationTemplate': 'search_application/_types/SearchApplicationTemplate.ts#L22-L27',
+'search_application._types.SearchApplication': 'search_application/_types/SearchApplication.ts#L24-L45',
+'search_application._types.SearchApplicationTemplate': 'search_application/_types/SearchApplication.ts#L47-L52',
 'search_application.delete.Request': 'search_application/delete/SearchApplicationsDeleteRequest.ts#L22-L36',
 'search_application.delete.Response': 'search_application/delete/SearchApplicationsDeleteResponse.ts#L22-L24',
 'search_application.delete_behavioral_analytics.Request': 'search_application/delete_behavioral_analytics/BehavioralAnalyticsDeleteRequest.ts#L22-L37',
@@ -2379,7 +2383,8 @@
 'search_application.get_behavioral_analytics.Request': 'search_application/get_behavioral_analytics/BehavioralAnalyticsGetRequest.ts#L22-L36',
 'search_application.get_behavioral_analytics.Response': 'search_application/get_behavioral_analytics/BehavioralAnalyticsGetResponse.ts#L24-L27',
 'search_application.list.Request': 'search_application/list/SearchApplicationsListRequest.ts#L22-L44',
-'search_application.list.Response': 'search_application/list/SearchApplicationsListResponse.ts#L23-L28',
+'search_application.list.Response': 'search_application/list/SearchApplicationsListResponse.ts#L24-L29',
+'search_application.list.SearchApplicationListItem': 'search_application/list/SearchApplicationsListResponse.ts#L31-L48',
 'search_application.put.Request': 'search_application/put/SearchApplicationsPutRequest.ts#L23-L48',
 'search_application.put.Response': 'search_application/put/SearchApplicationsPutResponse.ts#L22-L26',
 'search_application.put_behavioral_analytics.AnalyticsAcknowledgeResponseBase': 'search_application/put_behavioral_analytics/BehavioralAnalyticsPutResponse.ts#L27-L32',
@@ -2389,20 +2394,20 @@
 'search_application.search.Response': 'search_application/search/SearchApplicationsSearchResponse.ts#L22-L24',
 'searchable_snapshots._types.StatsLevel': 'searchable_snapshots/_types/stats.ts#L20-L24',
 'searchable_snapshots.cache_stats.Node': 'searchable_snapshots/cache_stats/Response.ts#L30-L32',
-'searchable_snapshots.cache_stats.Request': 'searchable_snapshots/cache_stats/Request.ts#L24-L38',
+'searchable_snapshots.cache_stats.Request': 'searchable_snapshots/cache_stats/Request.ts#L24-L35',
 'searchable_snapshots.cache_stats.Response': 'searchable_snapshots/cache_stats/Response.ts#L24-L28',
 'searchable_snapshots.cache_stats.Shared': 'searchable_snapshots/cache_stats/Response.ts#L34-L43',
-'searchable_snapshots.clear_cache.Request': 'searchable_snapshots/clear_cache/SearchableSnapshotsClearCacheRequest.ts#L23-L42',
+'searchable_snapshots.clear_cache.Request': 'searchable_snapshots/clear_cache/SearchableSnapshotsClearCacheRequest.ts#L23-L38',
 'searchable_snapshots.clear_cache.Response': 'searchable_snapshots/clear_cache/SearchableSnapshotsClearCacheResponse.ts#L22-L25',
 'searchable_snapshots.mount.MountedSnapshot': 'searchable_snapshots/mount/types.ts#L23-L27',
-'searchable_snapshots.mount.Request': 'searchable_snapshots/mount/SearchableSnapshotsMountRequest.ts#L26-L55',
+'searchable_snapshots.mount.Request': 'searchable_snapshots/mount/SearchableSnapshotsMountRequest.ts#L26-L49',
 'searchable_snapshots.mount.Response': 'searchable_snapshots/mount/SearchableSnapshotsMountResponse.ts#L22-L26',
-'searchable_snapshots.stats.Request': 'searchable_snapshots/stats/SearchableSnapshotsStatsRequest.ts#L24-L38',
+'searchable_snapshots.stats.Request': 'searchable_snapshots/stats/SearchableSnapshotsStatsRequest.ts#L24-L35',
 'searchable_snapshots.stats.Response': 'searchable_snapshots/stats/SearchableSnapshotsStatsResponse.ts#L22-L27',
 'security._types.Access': 'security/_types/Access.ts#L22-L31',
 'security._types.ApiKey': 'security/_types/ApiKey.ts#L27-L113',
 'security._types.ApiKeyType': 'security/_types/ApiKey.ts#L115-L118',
-'security._types.ApplicationGlobalUserPrivileges': 'security/_types/Privileges.ts#L409-L411',
+'security._types.ApplicationGlobalUserPrivileges': 'security/_types/Privileges.ts#L410-L412',
 'security._types.ApplicationPrivileges': 'security/_types/Privileges.ts#L27-L40',
 'security._types.BulkError': 'security/_types/Bulk.ts#L24-L33',
 'security._types.ClusterNode': 'security/_types/ClusterNode.ts#L22-L24',
@@ -2410,17 +2415,17 @@
 'security._types.CreatedStatus': 'security/_types/CreatedStatus.ts#L20-L22',
 'security._types.FieldRule': 'security/_types/RoleMappingRule.ts#L35-L43',
 'security._types.FieldSecurity': 'security/_types/FieldSecurity.ts#L22-L25',
-'security._types.GlobalPrivilege': 'security/_types/Privileges.ts#L405-L407',
+'security._types.GlobalPrivilege': 'security/_types/Privileges.ts#L406-L408',
 'security._types.GrantType': 'security/_types/GrantType.ts#L20-L29',
-'security._types.IndexPrivilege': 'security/_types/Privileges.ts#L361-L403',
-'security._types.IndicesPrivileges': 'security/_types/Privileges.ts#L216-L242',
-'security._types.IndicesPrivilegesQuery': 'security/_types/Privileges.ts#L316-L324',
-'security._types.ManageUserPrivileges': 'security/_types/Privileges.ts#L413-L415',
+'security._types.IndexPrivilege': 'security/_types/Privileges.ts#L362-L404',
+'security._types.IndicesPrivileges': 'security/_types/Privileges.ts#L217-L243',
+'security._types.IndicesPrivilegesQuery': 'security/_types/Privileges.ts#L317-L325',
+'security._types.ManageUserPrivileges': 'security/_types/Privileges.ts#L414-L416',
 'security._types.RealmInfo': 'security/_types/RealmInfo.ts#L22-L25',
-'security._types.RemoteClusterPrivilege': 'security/_types/Privileges.ts#L201-L213',
-'security._types.RemoteClusterPrivileges': 'security/_types/Privileges.ts#L278-L290',
-'security._types.RemoteIndicesPrivileges': 'security/_types/Privileges.ts#L244-L276',
-'security._types.ReplicationAccess': 'security/_types/Privileges.ts#L417-L427',
+'security._types.RemoteClusterPrivilege': 'security/_types/Privileges.ts#L201-L214',
+'security._types.RemoteClusterPrivileges': 'security/_types/Privileges.ts#L279-L291',
+'security._types.RemoteIndicesPrivileges': 'security/_types/Privileges.ts#L245-L277',
+'security._types.ReplicationAccess': 'security/_types/Privileges.ts#L418-L428',
 'security._types.Restriction': 'security/_types/RoleDescriptor.ts#L130-L132',
 'security._types.RestrictionWorkflow': 'security/_types/RoleDescriptor.ts#L134-L137',
 'security._types.RoleDescriptor': 'security/_types/RoleDescriptor.ts#L33-L80',
@@ -2428,13 +2433,13 @@
 'security._types.RoleMapping': 'security/_types/RoleMapping.ts#L25-L33',
 'security._types.RoleMappingRule': 'security/_types/RoleMappingRule.ts#L22-L33',
 'security._types.RoleTemplate': 'security/_types/RoleTemplate.ts#L28-L31',
-'security._types.RoleTemplateInlineQuery': 'security/_types/Privileges.ts#L358-L359',
-'security._types.RoleTemplateQuery': 'security/_types/Privileges.ts#L326-L336',
-'security._types.RoleTemplateScript': 'security/_types/Privileges.ts#L338-L356',
-'security._types.SearchAccess': 'security/_types/Privileges.ts#L429-L449',
+'security._types.RoleTemplateInlineQuery': 'security/_types/Privileges.ts#L359-L360',
+'security._types.RoleTemplateQuery': 'security/_types/Privileges.ts#L327-L337',
+'security._types.RoleTemplateScript': 'security/_types/Privileges.ts#L339-L357',
+'security._types.SearchAccess': 'security/_types/Privileges.ts#L430-L450',
 'security._types.TemplateFormat': 'security/_types/RoleTemplate.ts#L22-L25',
 'security._types.User': 'security/_types/User.ts#L23-L31',
-'security._types.UserIndicesPrivileges': 'security/_types/Privileges.ts#L292-L314',
+'security._types.UserIndicesPrivileges': 'security/_types/Privileges.ts#L293-L315',
 'security._types.UserProfile': 'security/_types/UserProfile.ts#L41-L47',
 'security._types.UserProfileHitMetadata': 'security/_types/UserProfile.ts#L27-L30',
 'security._types.UserProfileUser': 'security/_types/UserProfile.ts#L32-L39',
@@ -2495,10 +2500,10 @@
 'security.get_api_key.Request': 'security/get_api_key/SecurityGetApiKeyRequest.ts#L23-L88',
 'security.get_api_key.Response': 'security/get_api_key/SecurityGetApiKeyResponse.ts#L22-L24',
 'security.get_builtin_privileges.Request': 'security/get_builtin_privileges/SecurityGetBuiltinPrivilegesRequest.ts#L22-L32',
-'security.get_builtin_privileges.Response': 'security/get_builtin_privileges/SecurityGetBuiltinPrivilegesResponse.ts#L26-L35',
+'security.get_builtin_privileges.Response': 'security/get_builtin_privileges/SecurityGetBuiltinPrivilegesResponse.ts#L26-L32',
 'security.get_privileges.Request': 'security/get_privileges/SecurityGetPrivilegesRequest.ts#L23-L35',
 'security.get_privileges.Response': 'security/get_privileges/SecurityGetPrivilegesResponse.ts#L23-L26',
-'security.get_role.Request': 'security/get_role/SecurityGetRoleRequest.ts#L23-L39',
+'security.get_role.Request': 'security/get_role/SecurityGetRoleRequest.ts#L23-L41',
 'security.get_role.Response': 'security/get_role/SecurityGetRoleResponse.ts#L23-L26',
 'security.get_role.Role': 'security/get_role/types.ts#L32-L53',
 'security.get_role_mapping.Request': 'security/get_role_mapping/SecurityGetRoleMappingRequest.ts#L23-L42',
@@ -2542,7 +2547,7 @@
 'security.put_privileges.Actions': 'security/put_privileges/types.ts#L22-L27',
 'security.put_privileges.Request': 'security/put_privileges/SecurityPutPrivilegesRequest.ts#L25-L38',
 'security.put_privileges.Response': 'security/put_privileges/SecurityPutPrivilegesResponse.ts#L23-L26',
-'security.put_role.Request': 'security/put_role/SecurityPutRoleRequest.ts#L32-L101',
+'security.put_role.Request': 'security/put_role/SecurityPutRoleRequest.ts#L32-L102',
 'security.put_role.Response': 'security/put_role/SecurityPutRoleResponse.ts#L22-L24',
 'security.put_role_mapping.Request': 'security/put_role_mapping/SecurityPutRoleMappingRequest.ts#L25-L56',
 'security.put_role_mapping.Response': 'security/put_role_mapping/SecurityPutRoleMappingResponse.ts#L22-L24',
@@ -2584,17 +2589,17 @@
 'security.update_user_profile_data.Request': 'security/update_user_profile_data/Request.ts#L27-L72',
 'security.update_user_profile_data.Response': 'security/update_user_profile_data/Response.ts#L22-L24',
 'shutdown._types.Type': 'shutdown/_types/types.ts#L20-L24',
-'shutdown.delete_node.Request': 'shutdown/delete_node/ShutdownDeleteNodeRequest.ts#L24-L54',
+'shutdown.delete_node.Request': 'shutdown/delete_node/ShutdownDeleteNodeRequest.ts#L24-L44',
 'shutdown.delete_node.Response': 'shutdown/delete_node/ShutdownDeleteNodeResponse.ts#L22-L24',
 'shutdown.get_node.NodeShutdownStatus': 'shutdown/get_node/ShutdownGetNodeResponse.ts#L29-L38',
 'shutdown.get_node.PersistentTaskStatus': 'shutdown/get_node/ShutdownGetNodeResponse.ts#L56-L58',
 'shutdown.get_node.PluginsStatus': 'shutdown/get_node/ShutdownGetNodeResponse.ts#L60-L62',
-'shutdown.get_node.Request': 'shutdown/get_node/ShutdownGetNodeRequest.ts#L24-L53',
+'shutdown.get_node.Request': 'shutdown/get_node/ShutdownGetNodeRequest.ts#L24-L44',
 'shutdown.get_node.Response': 'shutdown/get_node/ShutdownGetNodeResponse.ts#L23-L27',
 'shutdown.get_node.ShardMigrationStatus': 'shutdown/get_node/ShutdownGetNodeResponse.ts#L52-L54',
 'shutdown.get_node.ShutdownStatus': 'shutdown/get_node/ShutdownGetNodeResponse.ts#L45-L50',
 'shutdown.get_node.ShutdownType': 'shutdown/get_node/ShutdownGetNodeResponse.ts#L40-L43',
-'shutdown.put_node.Request': 'shutdown/put_node/ShutdownPutNodeRequest.ts#L25-L91',
+'shutdown.put_node.Request': 'shutdown/put_node/ShutdownPutNodeRequest.ts#L25-L76',
 'shutdown.put_node.Response': 'shutdown/put_node/ShutdownPutNodeResponse.ts#L22-L24',
 'slm._types.Configuration': 'slm/_types/SnapshotLifecycle.ts#L99-L129',
 'slm._types.InProgress': 'slm/_types/SnapshotLifecycle.ts#L131-L136',
@@ -2603,23 +2608,23 @@
 'slm._types.Retention': 'slm/_types/SnapshotLifecycle.ts#L84-L97',
 'slm._types.SnapshotLifecycle': 'slm/_types/SnapshotLifecycle.ts#L38-L49',
 'slm._types.Statistics': 'slm/_types/SnapshotLifecycle.ts#L51-L74',
-'slm.delete_lifecycle.Request': 'slm/delete_lifecycle/DeleteSnapshotLifecycleRequest.ts#L23-L36',
+'slm.delete_lifecycle.Request': 'slm/delete_lifecycle/DeleteSnapshotLifecycleRequest.ts#L23-L32',
 'slm.delete_lifecycle.Response': 'slm/delete_lifecycle/DeleteSnapshotLifecycleResponse.ts#L22-L24',
-'slm.execute_lifecycle.Request': 'slm/execute_lifecycle/ExecuteSnapshotLifecycleRequest.ts#L23-L36',
+'slm.execute_lifecycle.Request': 'slm/execute_lifecycle/ExecuteSnapshotLifecycleRequest.ts#L23-L32',
 'slm.execute_lifecycle.Response': 'slm/execute_lifecycle/ExecuteSnapshotLifecycleResponse.ts#L22-L24',
-'slm.execute_retention.Request': 'slm/execute_retention/ExecuteRetentionRequest.ts#L22-L31',
+'slm.execute_retention.Request': 'slm/execute_retention/ExecuteRetentionRequest.ts#L22-L27',
 'slm.execute_retention.Response': 'slm/execute_retention/ExecuteRetentionResponse.ts#L22-L24',
-'slm.get_lifecycle.Request': 'slm/get_lifecycle/GetSnapshotLifecycleRequest.ts#L23-L38',
+'slm.get_lifecycle.Request': 'slm/get_lifecycle/GetSnapshotLifecycleRequest.ts#L23-L32',
 'slm.get_lifecycle.Response': 'slm/get_lifecycle/GetSnapshotLifecycleResponse.ts#L24-L27',
-'slm.get_stats.Request': 'slm/get_stats/GetSnapshotLifecycleStatsRequest.ts#L22-L30',
+'slm.get_stats.Request': 'slm/get_stats/GetSnapshotLifecycleStatsRequest.ts#L22-L27',
 'slm.get_stats.Response': 'slm/get_stats/GetSnapshotLifecycleStatsResponse.ts#L23-L36',
-'slm.get_status.Request': 'slm/get_status/GetSnapshotLifecycleManagementStatusRequest.ts#L22-L29',
+'slm.get_status.Request': 'slm/get_status/GetSnapshotLifecycleManagementStatusRequest.ts#L22-L27',
 'slm.get_status.Response': 'slm/get_status/GetSnapshotLifecycleManagementStatusResponse.ts#L22-L24',
-'slm.put_lifecycle.Request': 'slm/put_lifecycle/PutSnapshotLifecycleRequest.ts#L26-L78',
+'slm.put_lifecycle.Request': 'slm/put_lifecycle/PutSnapshotLifecycleRequest.ts#L26-L72',
 'slm.put_lifecycle.Response': 'slm/put_lifecycle/PutSnapshotLifecycleResponse.ts#L22-L24',
-'slm.start.Request': 'slm/start/StartSnapshotLifecycleManagementRequest.ts#L22-L31',
+'slm.start.Request': 'slm/start/StartSnapshotLifecycleManagementRequest.ts#L22-L27',
 'slm.start.Response': 'slm/start/StartSnapshotLifecycleManagementResponse.ts#L22-L24',
-'slm.stop.Request': 'slm/stop/StopSnapshotLifecycleManagementRequest.ts#L22-L35',
+'slm.stop.Request': 'slm/stop/StopSnapshotLifecycleManagementRequest.ts#L22-L27',
 'slm.stop.Response': 'slm/stop/StopSnapshotLifecycleManagementResponse.ts#L22-L24',
 'snapshot._types.AzureRepository': 'snapshot/_types/SnapshotRepository.ts#L40-L43',
 'snapshot._types.AzureRepositorySettings': 'snapshot/_types/SnapshotRepository.ts#L77-L83',
@@ -2651,32 +2656,32 @@
 'snapshot._types.SourceOnlyRepositorySettings': 'snapshot/_types/SnapshotRepository.ts#L117-L124',
 'snapshot._types.Status': 'snapshot/_types/SnapshotStatus.ts#L26-L35',
 'snapshot.cleanup_repository.CleanupRepositoryResults': 'snapshot/cleanup_repository/SnapshotCleanupRepositoryResponse.ts#L29-L34',
-'snapshot.cleanup_repository.Request': 'snapshot/cleanup_repository/SnapshotCleanupRepositoryRequest.ts#L24-L52',
+'snapshot.cleanup_repository.Request': 'snapshot/cleanup_repository/SnapshotCleanupRepositoryRequest.ts#L24-L49',
 'snapshot.cleanup_repository.Response': 'snapshot/cleanup_repository/SnapshotCleanupRepositoryResponse.ts#L22-L27',
-'snapshot.clone.Request': 'snapshot/clone/SnapshotCloneRequest.ts#L24-L45',
+'snapshot.clone.Request': 'snapshot/clone/SnapshotCloneRequest.ts#L24-L42',
 'snapshot.clone.Response': 'snapshot/clone/SnapshotCloneResponse.ts#L22-L24',
-'snapshot.create.Request': 'snapshot/create/SnapshotCreateRequest.ts#L24-L85',
+'snapshot.create.Request': 'snapshot/create/SnapshotCreateRequest.ts#L24-L81',
 'snapshot.create.Response': 'snapshot/create/SnapshotCreateResponse.ts#L22-L35',
-'snapshot.create_repository.Request': 'snapshot/create_repository/SnapshotCreateRepositoryRequest.ts#L25-L48',
+'snapshot.create_repository.Request': 'snapshot/create_repository/SnapshotCreateRepositoryRequest.ts#L25-L42',
 'snapshot.create_repository.Response': 'snapshot/create_repository/SnapshotCreateRepositoryResponse.ts#L22-L24',
-'snapshot.delete.Request': 'snapshot/delete/SnapshotDeleteRequest.ts#L24-L39',
+'snapshot.delete.Request': 'snapshot/delete/SnapshotDeleteRequest.ts#L24-L37',
 'snapshot.delete.Response': 'snapshot/delete/SnapshotDeleteResponse.ts#L22-L24',
-'snapshot.delete_repository.Request': 'snapshot/delete_repository/SnapshotDeleteRepositoryRequest.ts#L24-L42',
+'snapshot.delete_repository.Request': 'snapshot/delete_repository/SnapshotDeleteRepositoryRequest.ts#L24-L38',
 'snapshot.delete_repository.Response': 'snapshot/delete_repository/SnapshotDeleteRepositoryResponse.ts#L22-L24',
-'snapshot.get.Request': 'snapshot/get/SnapshotGetRequest.ts#L27-L129',
+'snapshot.get.Request': 'snapshot/get/SnapshotGetRequest.ts#L27-L127',
 'snapshot.get.Response': 'snapshot/get/SnapshotGetResponse.ts#L25-L42',
 'snapshot.get.SnapshotResponseItem': 'snapshot/get/SnapshotGetResponse.ts#L44-L48',
-'snapshot.get_repository.Request': 'snapshot/get_repository/SnapshotGetRepositoryRequest.ts#L24-L40',
+'snapshot.get_repository.Request': 'snapshot/get_repository/SnapshotGetRepositoryRequest.ts#L24-L38',
 'snapshot.get_repository.Response': 'snapshot/get_repository/SnapshotGetRepositoryResponse.ts#L23-L25',
-'snapshot.repository_verify_integrity.Request': 'snapshot/repository_verify_integrity/SnapshotRepositoryVerifyIntegrityRequest.ts#L24-L72',
+'snapshot.repository_verify_integrity.Request': 'snapshot/repository_verify_integrity/SnapshotRepositoryVerifyIntegrityRequest.ts#L24-L43',
 'snapshot.repository_verify_integrity.Response': 'snapshot/repository_verify_integrity/SnapshotRepositoryVerifyIntegrityResponse.ts#L22-L24',
-'snapshot.restore.Request': 'snapshot/restore/SnapshotRestoreRequest.ts#L25-L71',
+'snapshot.restore.Request': 'snapshot/restore/SnapshotRestoreRequest.ts#L25-L51',
 'snapshot.restore.Response': 'snapshot/restore/SnapshotRestoreResponse.ts#L23-L28',
 'snapshot.restore.SnapshotRestore': 'snapshot/restore/SnapshotRestoreResponse.ts#L30-L34',
-'snapshot.status.Request': 'snapshot/status/SnapshotStatusRequest.ts#L24-L50',
+'snapshot.status.Request': 'snapshot/status/SnapshotStatusRequest.ts#L24-L38',
 'snapshot.status.Response': 'snapshot/status/SnapshotStatusResponse.ts#L22-L24',
 'snapshot.verify_repository.CompactNodeInfo': 'snapshot/verify_repository/SnapshotVerifyRepositoryResponse.ts#L27-L29',
-'snapshot.verify_repository.Request': 'snapshot/verify_repository/SnapshotVerifyRepositoryRequest.ts#L24-L42',
+'snapshot.verify_repository.Request': 'snapshot/verify_repository/SnapshotVerifyRepositoryRequest.ts#L24-L38',
 'snapshot.verify_repository.Response': 'snapshot/verify_repository/SnapshotVerifyRepositoryResponse.ts#L23-L25',
 'sql.Column': 'sql/types.ts#L23-L26',
 'sql.clear_cursor.Request': 'sql/clear_cursor/ClearSqlCursorRequest.ts#L22-L35',
@@ -2803,7 +2808,7 @@
 'watcher._types.ExecutionState': 'watcher/_types/Action.ts#L114-L118',
 'watcher._types.ExecutionStatus': 'watcher/_types/Execution.ts#L38-L47',
 'watcher._types.ExecutionThreadPool': 'watcher/_types/Execution.ts#L94-L97',
-'watcher._types.HourAndMinute': 'watcher/_types/Schedule.ts#L106-L109',
+'watcher._types.HourAndMinute': 'watcher/_types/Schedule.ts#L105-L108',
 'watcher._types.HourlySchedule': 'watcher/_types/Schedule.ts#L47-L49',
 'watcher._types.HttpEmailAttachment': 'watcher/_types/Actions.ts#L218-L222',
 'watcher._types.HttpInput': 'watcher/_types/Input.ts#L44-L48',
@@ -2834,9 +2839,9 @@
 'watcher._types.QueryWatch': 'watcher/_types/Watch.ts#L58-L64',
 'watcher._types.ReportingEmailAttachment': 'watcher/_types/Actions.ts#L224-L232',
 'watcher._types.ResponseContentType': 'watcher/_types/Input.ts#L106-L110',
-'watcher._types.ScheduleContainer': 'watcher/_types/Schedule.ts#L80-L92',
-'watcher._types.ScheduleTimeOfDay': 'watcher/_types/Schedule.ts#L99-L104',
-'watcher._types.ScheduleTriggerEvent': 'watcher/_types/Schedule.ts#L94-L97',
+'watcher._types.ScheduleContainer': 'watcher/_types/Schedule.ts#L80-L91',
+'watcher._types.ScheduleTimeOfDay': 'watcher/_types/Schedule.ts#L98-L103',
+'watcher._types.ScheduleTriggerEvent': 'watcher/_types/Schedule.ts#L93-L96',
 'watcher._types.ScriptCondition': 'watcher/_types/Conditions.ts#L79-L87',
 'watcher._types.SearchInput': 'watcher/_types/Input.ts#L112-L116',
 'watcher._types.SearchInputRequestBody': 'watcher/_types/Input.ts#L147-L149',
@@ -2850,9 +2855,9 @@
 'watcher._types.SlackMessage': 'watcher/_types/Actions.ts#L130-L137',
 'watcher._types.SlackResult': 'watcher/_types/Actions.ts#L96-L99',
 'watcher._types.ThrottleState': 'watcher/_types/Action.ts#L120-L123',
-'watcher._types.TimeOfMonth': 'watcher/_types/Schedule.ts#L111-L114',
-'watcher._types.TimeOfWeek': 'watcher/_types/Schedule.ts#L116-L119',
-'watcher._types.TimeOfYear': 'watcher/_types/Schedule.ts#L121-L125',
+'watcher._types.TimeOfMonth': 'watcher/_types/Schedule.ts#L110-L113',
+'watcher._types.TimeOfWeek': 'watcher/_types/Schedule.ts#L115-L118',
+'watcher._types.TimeOfYear': 'watcher/_types/Schedule.ts#L120-L124',
 'watcher._types.TriggerContainer': 'watcher/_types/Trigger.ts#L23-L28',
 'watcher._types.TriggerEventContainer': 'watcher/_types/Trigger.ts#L32-L37',
 'watcher._types.TriggerEventResult': 'watcher/_types/Trigger.ts#L39-L43',
@@ -2967,10 +2972,10 @@
         if (hash.length > 1) {
             hash = hash.substring(1);
         }
-        window.location = "https://github.com/elastic/elasticsearch-specification/tree/fd5d7cff3f7e72348ac3ebf32bfadd7be9243b86/specification/" + (paths[hash] || "");
+        window.location = "https://github.com/elastic/elasticsearch-specification/tree/b8071e8a539550d8cbaee3bae954ed4cc98d8422/specification/" + (paths[hash] || "");
     </script>
 </head>
 <body>
-    Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/fd5d7cff3f7e72348ac3ebf32bfadd7be9243b86/specification/">Elasticsearch API specification</a>.
+    Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/b8071e8a539550d8cbaee3bae954ed4cc98d8422/specification/">Elasticsearch API specification</a>.
 </body>
 </html>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/eql/EqlSearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/eql/EqlSearchRequest.java
index 603e1074b..a06bce4f4 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/eql/EqlSearchRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/eql/EqlSearchRequest.java
@@ -39,7 +39,6 @@
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Boolean;
-import java.lang.Integer;
 import java.lang.Number;
 import java.lang.String;
 import java.util.HashMap;
@@ -106,9 +105,6 @@ public class EqlSearchRequest extends RequestBase implements JsonpSerializable {
 	@Nullable
 	private final Boolean keepOnCompletion;
 
-	@Nullable
-	private final Integer maxSamplesPerKey;
-
 	private final String query;
 
 	@Nullable
@@ -143,7 +139,6 @@ private EqlSearchRequest(Builder builder) {
 		this.index = ApiTypeHelper.unmodifiableRequired(builder.index, this, "index");
 		this.keepAlive = builder.keepAlive;
 		this.keepOnCompletion = builder.keepOnCompletion;
-		this.maxSamplesPerKey = builder.maxSamplesPerKey;
 		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
 		this.resultPosition = builder.resultPosition;
 		this.runtimeMappings = ApiTypeHelper.unmodifiable(builder.runtimeMappings);
@@ -256,21 +251,6 @@ public final Boolean keepOnCompletion() {
 		return this.keepOnCompletion;
 	}
 
-	/**
-	 * By default, the response of a sample query contains up to <code>10</code>
-	 * samples, with one sample per unique set of join keys. Use the
-	 * <code>size</code> parameter to get a smaller or larger set of samples. To
-	 * retrieve more than one sample per set of join keys, use the
-	 * <code>max_samples_per_key</code> parameter. Pipes are not supported for
-	 * sample queries.
-	 * <p>
-	 * API name: {@code max_samples_per_key}
-	 */
-	@Nullable
-	public final Integer maxSamplesPerKey() {
-		return this.maxSamplesPerKey;
-	}
-
 	/**
 	 * Required - EQL query you wish to run.
 	 * <p>
@@ -389,11 +369,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			generator.writeKey("keep_on_completion");
 			generator.write(this.keepOnCompletion);
 
-		}
-		if (this.maxSamplesPerKey != null) {
-			generator.writeKey("max_samples_per_key");
-			generator.write(this.maxSamplesPerKey);
-
 		}
 		generator.writeKey("query");
 		generator.write(this.query);
@@ -477,9 +452,6 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Boolean keepOnCompletion;
 
-		@Nullable
-		private Integer maxSamplesPerKey;
-
 		private String query;
 
 		@Nullable
@@ -689,21 +661,6 @@ public final Builder keepOnCompletion(@Nullable Boolean value) {
 			return this;
 		}
 
-		/**
-		 * By default, the response of a sample query contains up to <code>10</code>
-		 * samples, with one sample per unique set of join keys. Use the
-		 * <code>size</code> parameter to get a smaller or larger set of samples. To
-		 * retrieve more than one sample per set of join keys, use the
-		 * <code>max_samples_per_key</code> parameter. Pipes are not supported for
-		 * sample queries.
-		 * <p>
-		 * API name: {@code max_samples_per_key}
-		 */
-		public final Builder maxSamplesPerKey(@Nullable Integer value) {
-			this.maxSamplesPerKey = value;
-			return this;
-		}
-
 		/**
 		 * Required - EQL query you wish to run.
 		 * <p>
@@ -833,7 +790,6 @@ protected static void setupEqlSearchRequestDeserializer(ObjectDeserializer<EqlSe
 		op.add(Builder::filter, JsonpDeserializer.arrayDeserializer(Query._DESERIALIZER), "filter");
 		op.add(Builder::keepAlive, Time._DESERIALIZER, "keep_alive");
 		op.add(Builder::keepOnCompletion, JsonpDeserializer.booleanDeserializer(), "keep_on_completion");
-		op.add(Builder::maxSamplesPerKey, JsonpDeserializer.integerDeserializer(), "max_samples_per_key");
 		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
 		op.add(Builder::resultPosition, ResultPosition._DESERIALIZER, "result_position");
 		op.add(Builder::runtimeMappings, JsonpDeserializer.stringMapDeserializer(RuntimeField._DESERIALIZER),
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/ElasticsearchFleetAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/ElasticsearchFleetAsyncClient.java
index 94e8a968d..3dd41c32c 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/ElasticsearchFleetAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/ElasticsearchFleetAsyncClient.java
@@ -70,9 +70,9 @@ public ElasticsearchFleetAsyncClient withTransportOptions(@Nullable TransportOpt
 	// ----- Endpoint: fleet.search
 
 	/**
-	 * Run a Fleet search. The purpose of the Fleet search API is to provide an API
-	 * where the search will be run only after the provided checkpoint has been
-	 * processed and is visible for searches inside of Elasticsearch.
+	 * The purpose of the fleet search api is to provide a search api where the
+	 * search will only be executed after provided checkpoint has been processed and
+	 * is visible for searches inside of Elasticsearch.
 	 * 
 	 * @see <a href="null">Documentation on elastic.co</a>
 	 */
@@ -88,9 +88,9 @@ public <TDocument> CompletableFuture<FleetSearchResponse<TDocument>> search(Flee
 	}
 
 	/**
-	 * Run a Fleet search. The purpose of the Fleet search API is to provide an API
-	 * where the search will be run only after the provided checkpoint has been
-	 * processed and is visible for searches inside of Elasticsearch.
+	 * The purpose of the fleet search api is to provide a search api where the
+	 * search will only be executed after provided checkpoint has been processed and
+	 * is visible for searches inside of Elasticsearch.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -105,9 +105,9 @@ public final <TDocument> CompletableFuture<FleetSearchResponse<TDocument>> searc
 	}
 
 	/**
-	 * Run a Fleet search. The purpose of the Fleet search API is to provide an API
-	 * where the search will be run only after the provided checkpoint has been
-	 * processed and is visible for searches inside of Elasticsearch.
+	 * The purpose of the fleet search api is to provide a search api where the
+	 * search will only be executed after provided checkpoint has been processed and
+	 * is visible for searches inside of Elasticsearch.
 	 * 
 	 * @see <a href="null">Documentation on elastic.co</a>
 	 */
@@ -123,9 +123,9 @@ public <TDocument> CompletableFuture<FleetSearchResponse<TDocument>> search(Flee
 	}
 
 	/**
-	 * Run a Fleet search. The purpose of the Fleet search API is to provide an API
-	 * where the search will be run only after the provided checkpoint has been
-	 * processed and is visible for searches inside of Elasticsearch.
+	 * The purpose of the fleet search api is to provide a search api where the
+	 * search will only be executed after provided checkpoint has been processed and
+	 * is visible for searches inside of Elasticsearch.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/ElasticsearchFleetClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/ElasticsearchFleetClient.java
index 30503174d..6cc870710 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/ElasticsearchFleetClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/ElasticsearchFleetClient.java
@@ -70,9 +70,9 @@ public ElasticsearchFleetClient withTransportOptions(@Nullable TransportOptions
 	// ----- Endpoint: fleet.search
 
 	/**
-	 * Run a Fleet search. The purpose of the Fleet search API is to provide an API
-	 * where the search will be run only after the provided checkpoint has been
-	 * processed and is visible for searches inside of Elasticsearch.
+	 * The purpose of the fleet search api is to provide a search api where the
+	 * search will only be executed after provided checkpoint has been processed and
+	 * is visible for searches inside of Elasticsearch.
 	 * 
 	 * @see <a href="null">Documentation on elastic.co</a>
 	 */
@@ -88,9 +88,9 @@ public <TDocument> FleetSearchResponse<TDocument> search(FleetSearchRequest requ
 	}
 
 	/**
-	 * Run a Fleet search. The purpose of the Fleet search API is to provide an API
-	 * where the search will be run only after the provided checkpoint has been
-	 * processed and is visible for searches inside of Elasticsearch.
+	 * The purpose of the fleet search api is to provide a search api where the
+	 * search will only be executed after provided checkpoint has been processed and
+	 * is visible for searches inside of Elasticsearch.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -105,9 +105,9 @@ public final <TDocument> FleetSearchResponse<TDocument> search(
 	}
 
 	/**
-	 * Run a Fleet search. The purpose of the Fleet search API is to provide an API
-	 * where the search will be run only after the provided checkpoint has been
-	 * processed and is visible for searches inside of Elasticsearch.
+	 * The purpose of the fleet search api is to provide a search api where the
+	 * search will only be executed after provided checkpoint has been processed and
+	 * is visible for searches inside of Elasticsearch.
 	 * 
 	 * @see <a href="null">Documentation on elastic.co</a>
 	 */
@@ -123,9 +123,9 @@ public <TDocument> FleetSearchResponse<TDocument> search(FleetSearchRequest requ
 	}
 
 	/**
-	 * Run a Fleet search. The purpose of the Fleet search API is to provide an API
-	 * where the search will be run only after the provided checkpoint has been
-	 * processed and is visible for searches inside of Elasticsearch.
+	 * The purpose of the fleet search api is to provide a search api where the
+	 * search will only be executed after provided checkpoint has been processed and
+	 * is visible for searches inside of Elasticsearch.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java
index 1fd937219..898fa6d7f 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/fleet/FleetSearchRequest.java
@@ -84,9 +84,9 @@
 // typedef: fleet.search.Request
 
 /**
- * Run a Fleet search. The purpose of the Fleet search API is to provide an API
- * where the search will be run only after the provided checkpoint has been
- * processed and is visible for searches inside of Elasticsearch.
+ * The purpose of the fleet search api is to provide a search api where the
+ * search will only be executed after provided checkpoint has been processed and
+ * is visible for searches inside of Elasticsearch.
  * 
  * @see <a href="../doc-files/api-spec.html#fleet.search.Request">API
  *      specification</a>
@@ -158,6 +158,9 @@ public class FleetSearchRequest extends RequestBase implements JsonpSerializable
 	@Nullable
 	private final Long maxConcurrentShardRequests;
 
+	@Nullable
+	private final String minCompatibleShardNode;
+
 	@Nullable
 	private final Double minScore;
 
@@ -265,6 +268,7 @@ private FleetSearchRequest(Builder builder) {
 		this.indicesBoost = ApiTypeHelper.unmodifiable(builder.indicesBoost);
 		this.lenient = builder.lenient;
 		this.maxConcurrentShardRequests = builder.maxConcurrentShardRequests;
+		this.minCompatibleShardNode = builder.minCompatibleShardNode;
 		this.minScore = builder.minScore;
 		this.pit = builder.pit;
 		this.postFilter = builder.postFilter;
@@ -516,6 +520,14 @@ public final Long maxConcurrentShardRequests() {
 		return this.maxConcurrentShardRequests;
 	}
 
+	/**
+	 * API name: {@code min_compatible_shard_node}
+	 */
+	@Nullable
+	public final String minCompatibleShardNode() {
+		return this.minCompatibleShardNode;
+	}
+
 	/**
 	 * Minimum _score for matching documents. Documents with a lower _score are not
 	 * included in the search results.
@@ -1120,6 +1132,9 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Long maxConcurrentShardRequests;
 
+		@Nullable
+		private String minCompatibleShardNode;
+
 		@Nullable
 		private Double minScore;
 
@@ -1568,6 +1583,14 @@ public final Builder maxConcurrentShardRequests(@Nullable Long value) {
 			return this;
 		}
 
+		/**
+		 * API name: {@code min_compatible_shard_node}
+		 */
+		public final Builder minCompatibleShardNode(@Nullable String value) {
+			this.minCompatibleShardNode = value;
+			return this;
+		}
+
 		/**
 		 * Minimum _score for matching documents. Documents with a lower _score are not
 		 * included in the search results.
@@ -2266,6 +2289,9 @@ protected static void setupFleetSearchRequestDeserializer(ObjectDeserializer<Fle
 				if (request.preFilterShardSize != null) {
 					params.put("pre_filter_shard_size", String.valueOf(request.preFilterShardSize));
 				}
+				if (request.minCompatibleShardNode != null) {
+					params.put("min_compatible_shard_node", request.minCompatibleShardNode);
+				}
 				if (request.lenient != null) {
 					params.put("lenient", String.valueOf(request.lenient));
 				}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamLifecycle.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamLifecycle.java
index db24b9183..7d8973e75 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamLifecycle.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamLifecycle.java
@@ -30,7 +30,6 @@
 import co.elastic.clients.util.ObjectBuilder;
 import co.elastic.clients.util.WithJsonObjectBuilderBase;
 import jakarta.json.stream.JsonGenerator;
-import java.lang.Boolean;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Nullable;
@@ -68,29 +67,20 @@ public class DataStreamLifecycle implements JsonpSerializable {
 	@Nullable
 	private final DataStreamLifecycleDownsampling downsampling;
 
-	@Nullable
-	private final Boolean enabled;
-
 	// ---------------------------------------------------------------------------------------------
 
-	protected DataStreamLifecycle(AbstractBuilder<?> builder) {
+	private DataStreamLifecycle(Builder builder) {
 
 		this.dataRetention = builder.dataRetention;
 		this.downsampling = builder.downsampling;
-		this.enabled = builder.enabled;
 
 	}
 
-	public static DataStreamLifecycle dataStreamLifecycleOf(Function<Builder, ObjectBuilder<DataStreamLifecycle>> fn) {
+	public static DataStreamLifecycle of(Function<Builder, ObjectBuilder<DataStreamLifecycle>> fn) {
 		return fn.apply(new Builder()).build();
 	}
 
 	/**
-	 * If defined, every document added to this data stream will be stored at least
-	 * for this time frame. Any time after this duration the document could be
-	 * deleted. When empty, every document in this data stream will be stored
-	 * indefinitely.
-	 * <p>
 	 * API name: {@code data_retention}
 	 */
 	@Nullable
@@ -99,9 +89,6 @@ public final Time dataRetention() {
 	}
 
 	/**
-	 * The downsampling configuration to execute for the managed backing index after
-	 * rollover.
-	 * <p>
 	 * API name: {@code downsampling}
 	 */
 	@Nullable
@@ -109,19 +96,6 @@ public final DataStreamLifecycleDownsampling downsampling() {
 		return this.downsampling;
 	}
 
-	/**
-	 * If defined, it turns data stream lifecycle on/off
-	 * (<code>true</code>/<code>false</code>) for this data stream. A data stream
-	 * lifecycle that's disabled (enabled: <code>false</code>) will have no effect
-	 * on the data stream.
-	 * <p>
-	 * API name: {@code enabled}
-	 */
-	@Nullable
-	public final Boolean enabled() {
-		return this.enabled;
-	}
-
 	/**
 	 * Serialize this object to JSON.
 	 */
@@ -143,11 +117,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			this.downsampling.serialize(generator, mapper);
 
 		}
-		if (this.enabled != null) {
-			generator.writeKey("enabled");
-			generator.write(this.enabled);
-
-		}
 
 	}
 
@@ -162,101 +131,62 @@ public String toString() {
 	 * Builder for {@link DataStreamLifecycle}.
 	 */
 
-	public static class Builder extends DataStreamLifecycle.AbstractBuilder<Builder>
+	public static class Builder extends WithJsonObjectBuilderBase<Builder>
 			implements
 				ObjectBuilder<DataStreamLifecycle> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link DataStreamLifecycle}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public DataStreamLifecycle build() {
-			_checkSingleUse();
-
-			return new DataStreamLifecycle(this);
-		}
-	}
-
-	public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				WithJsonObjectBuilderBase<BuilderT> {
 		@Nullable
 		private Time dataRetention;
 
 		@Nullable
 		private DataStreamLifecycleDownsampling downsampling;
 
-		@Nullable
-		private Boolean enabled;
-
 		/**
-		 * If defined, every document added to this data stream will be stored at least
-		 * for this time frame. Any time after this duration the document could be
-		 * deleted. When empty, every document in this data stream will be stored
-		 * indefinitely.
-		 * <p>
 		 * API name: {@code data_retention}
 		 */
-		public final BuilderT dataRetention(@Nullable Time value) {
+		public final Builder dataRetention(@Nullable Time value) {
 			this.dataRetention = value;
-			return self();
+			return this;
 		}
 
 		/**
-		 * If defined, every document added to this data stream will be stored at least
-		 * for this time frame. Any time after this duration the document could be
-		 * deleted. When empty, every document in this data stream will be stored
-		 * indefinitely.
-		 * <p>
 		 * API name: {@code data_retention}
 		 */
-		public final BuilderT dataRetention(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+		public final Builder dataRetention(Function<Time.Builder, ObjectBuilder<Time>> fn) {
 			return this.dataRetention(fn.apply(new Time.Builder()).build());
 		}
 
 		/**
-		 * The downsampling configuration to execute for the managed backing index after
-		 * rollover.
-		 * <p>
 		 * API name: {@code downsampling}
 		 */
-		public final BuilderT downsampling(@Nullable DataStreamLifecycleDownsampling value) {
+		public final Builder downsampling(@Nullable DataStreamLifecycleDownsampling value) {
 			this.downsampling = value;
-			return self();
+			return this;
 		}
 
 		/**
-		 * The downsampling configuration to execute for the managed backing index after
-		 * rollover.
-		 * <p>
 		 * API name: {@code downsampling}
 		 */
-		public final BuilderT downsampling(
+		public final Builder downsampling(
 				Function<DataStreamLifecycleDownsampling.Builder, ObjectBuilder<DataStreamLifecycleDownsampling>> fn) {
 			return this.downsampling(fn.apply(new DataStreamLifecycleDownsampling.Builder()).build());
 		}
 
-		/**
-		 * If defined, it turns data stream lifecycle on/off
-		 * (<code>true</code>/<code>false</code>) for this data stream. A data stream
-		 * lifecycle that's disabled (enabled: <code>false</code>) will have no effect
-		 * on the data stream.
-		 * <p>
-		 * API name: {@code enabled}
-		 */
-		public final BuilderT enabled(@Nullable Boolean value) {
-			this.enabled = value;
-			return self();
+		@Override
+		protected Builder self() {
+			return this;
 		}
 
-		protected abstract BuilderT self();
+		/**
+		 * Builds a {@link DataStreamLifecycle}.
+		 *
+		 * @throws NullPointerException
+		 *             if some of the required fields are null.
+		 */
+		public DataStreamLifecycle build() {
+			_checkSingleUse();
 
+			return new DataStreamLifecycle(this);
+		}
 	}
 
 	// ---------------------------------------------------------------------------------------------
@@ -267,12 +197,10 @@ public final BuilderT enabled(@Nullable Boolean value) {
 	public static final JsonpDeserializer<DataStreamLifecycle> _DESERIALIZER = ObjectBuilderDeserializer
 			.lazy(Builder::new, DataStreamLifecycle::setupDataStreamLifecycleDeserializer);
 
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupDataStreamLifecycleDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+	protected static void setupDataStreamLifecycleDeserializer(ObjectDeserializer<DataStreamLifecycle.Builder> op) {
 
-		op.add(AbstractBuilder::dataRetention, Time._DESERIALIZER, "data_retention");
-		op.add(AbstractBuilder::downsampling, DataStreamLifecycleDownsampling._DESERIALIZER, "downsampling");
-		op.add(AbstractBuilder::enabled, JsonpDeserializer.booleanDeserializer(), "enabled");
+		op.add(Builder::dataRetention, Time._DESERIALIZER, "data_retention");
+		op.add(Builder::downsampling, DataStreamLifecycleDownsampling._DESERIALIZER, "downsampling");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamLifecycleWithRollover.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamLifecycleWithRollover.java
index b16773b7d..14e94e6e1 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamLifecycleWithRollover.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/DataStreamLifecycleWithRollover.java
@@ -19,12 +19,16 @@
 
 package co.elastic.clients.elasticsearch.indices;
 
+import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ObjectBuilder;
+import co.elastic.clients.util.WithJsonObjectBuilderBase;
 import jakarta.json.stream.JsonGenerator;
 import java.util.Objects;
 import java.util.function.Function;
@@ -56,15 +60,22 @@
  *      specification</a>
  */
 @JsonpDeserializable
-public class DataStreamLifecycleWithRollover extends DataStreamLifecycle {
+public class DataStreamLifecycleWithRollover implements JsonpSerializable {
+	@Nullable
+	private final Time dataRetention;
+
+	@Nullable
+	private final DataStreamLifecycleDownsampling downsampling;
+
 	@Nullable
 	private final DataStreamLifecycleRolloverConditions rollover;
 
 	// ---------------------------------------------------------------------------------------------
 
 	private DataStreamLifecycleWithRollover(Builder builder) {
-		super(builder);
 
+		this.dataRetention = builder.dataRetention;
+		this.downsampling = builder.downsampling;
 		this.rollover = builder.rollover;
 
 	}
@@ -74,6 +85,30 @@ public static DataStreamLifecycleWithRollover of(
 		return fn.apply(new Builder()).build();
 	}
 
+	/**
+	 * If defined, every document added to this data stream will be stored at least
+	 * for this time frame. Any time after this duration the document could be
+	 * deleted. When empty, every document in this data stream will be stored
+	 * indefinitely.
+	 * <p>
+	 * API name: {@code data_retention}
+	 */
+	@Nullable
+	public final Time dataRetention() {
+		return this.dataRetention;
+	}
+
+	/**
+	 * The downsampling configuration to execute for the managed backing index after
+	 * rollover.
+	 * <p>
+	 * API name: {@code downsampling}
+	 */
+	@Nullable
+	public final DataStreamLifecycleDownsampling downsampling() {
+		return this.downsampling;
+	}
+
 	/**
 	 * The conditions which will trigger the rollover of a backing index as
 	 * configured by the cluster setting
@@ -89,9 +124,27 @@ public final DataStreamLifecycleRolloverConditions rollover() {
 		return this.rollover;
 	}
 
+	/**
+	 * Serialize this object to JSON.
+	 */
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+		generator.writeStartObject();
+		serializeInternal(generator, mapper);
+		generator.writeEnd();
+	}
+
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
+		if (this.dataRetention != null) {
+			generator.writeKey("data_retention");
+			this.dataRetention.serialize(generator, mapper);
+
+		}
+		if (this.downsampling != null) {
+			generator.writeKey("downsampling");
+			this.downsampling.serialize(generator, mapper);
+
+		}
 		if (this.rollover != null) {
 			generator.writeKey("rollover");
 			this.rollover.serialize(generator, mapper);
@@ -100,18 +153,76 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
 	 * Builder for {@link DataStreamLifecycleWithRollover}.
 	 */
 
-	public static class Builder extends DataStreamLifecycle.AbstractBuilder<Builder>
+	public static class Builder extends WithJsonObjectBuilderBase<Builder>
 			implements
 				ObjectBuilder<DataStreamLifecycleWithRollover> {
+		@Nullable
+		private Time dataRetention;
+
+		@Nullable
+		private DataStreamLifecycleDownsampling downsampling;
+
 		@Nullable
 		private DataStreamLifecycleRolloverConditions rollover;
 
+		/**
+		 * If defined, every document added to this data stream will be stored at least
+		 * for this time frame. Any time after this duration the document could be
+		 * deleted. When empty, every document in this data stream will be stored
+		 * indefinitely.
+		 * <p>
+		 * API name: {@code data_retention}
+		 */
+		public final Builder dataRetention(@Nullable Time value) {
+			this.dataRetention = value;
+			return this;
+		}
+
+		/**
+		 * If defined, every document added to this data stream will be stored at least
+		 * for this time frame. Any time after this duration the document could be
+		 * deleted. When empty, every document in this data stream will be stored
+		 * indefinitely.
+		 * <p>
+		 * API name: {@code data_retention}
+		 */
+		public final Builder dataRetention(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.dataRetention(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * The downsampling configuration to execute for the managed backing index after
+		 * rollover.
+		 * <p>
+		 * API name: {@code downsampling}
+		 */
+		public final Builder downsampling(@Nullable DataStreamLifecycleDownsampling value) {
+			this.downsampling = value;
+			return this;
+		}
+
+		/**
+		 * The downsampling configuration to execute for the managed backing index after
+		 * rollover.
+		 * <p>
+		 * API name: {@code downsampling}
+		 */
+		public final Builder downsampling(
+				Function<DataStreamLifecycleDownsampling.Builder, ObjectBuilder<DataStreamLifecycleDownsampling>> fn) {
+			return this.downsampling(fn.apply(new DataStreamLifecycleDownsampling.Builder()).build());
+		}
+
 		/**
 		 * The conditions which will trigger the rollover of a backing index as
 		 * configured by the cluster setting
@@ -170,7 +281,9 @@ public DataStreamLifecycleWithRollover build() {
 
 	protected static void setupDataStreamLifecycleWithRolloverDeserializer(
 			ObjectDeserializer<DataStreamLifecycleWithRollover.Builder> op) {
-		DataStreamLifecycle.setupDataStreamLifecycleDeserializer(op);
+
+		op.add(Builder::dataRetention, Time._DESERIALIZER, "data_retention");
+		op.add(Builder::downsampling, DataStreamLifecycleDownsampling._DESERIALIZER, "downsampling");
 		op.add(Builder::rollover, DataStreamLifecycleRolloverConditions._DESERIALIZER, "rollover");
 
 	}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsAliasRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsAliasRequest.java
index afa873138..9a441a4f8 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsAliasRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/ExistsAliasRequest.java
@@ -22,7 +22,6 @@
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
 import co.elastic.clients.elasticsearch._types.ExpandWildcard;
 import co.elastic.clients.elasticsearch._types.RequestBase;
-import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -80,7 +79,7 @@ public class ExistsAliasRequest extends RequestBase {
 	private final List<String> index;
 
 	@Nullable
-	private final Time masterTimeout;
+	private final Boolean local;
 
 	private final List<String> name;
 
@@ -92,7 +91,7 @@ private ExistsAliasRequest(Builder builder) {
 		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
 		this.ignoreUnavailable = builder.ignoreUnavailable;
 		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.masterTimeout = builder.masterTimeout;
+		this.local = builder.local;
 		this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
 
 	}
@@ -151,14 +150,17 @@ public final List<String> index() {
 	}
 
 	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
+	 * If <code>true</code>, the request retrieves information from the local node
+	 * only.
 	 * <p>
-	 * API name: {@code master_timeout}
+	 * API name: {@code local}
+	 * 
+	 * @deprecated 8.12.0
 	 */
+	@Deprecated
 	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
+	public final Boolean local() {
+		return this.local;
 	}
 
 	/**
@@ -193,7 +195,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
 		private List<String> index;
 
 		@Nullable
-		private Time masterTimeout;
+		private Boolean local;
 
 		private List<String> name;
 
@@ -284,26 +286,19 @@ public final Builder index(String value, String... values) {
 		}
 
 		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
+		 * If <code>true</code>, the request retrieves information from the local node
+		 * only.
 		 * <p>
-		 * API name: {@code master_timeout}
+		 * API name: {@code local}
+		 * 
+		 * @deprecated 8.12.0
 		 */
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
+		@Deprecated
+		public final Builder local(@Nullable Boolean value) {
+			this.local = value;
 			return this;
 		}
 
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
 		/**
 		 * Required - Comma-separated list of aliases to check. Supports wildcards
 		 * (<code>*</code>).
@@ -418,9 +413,6 @@ public ExistsAliasRequest build() {
 			// Request parameters
 			request -> {
 				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
 				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
 					params.put("expand_wildcards",
 							request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
@@ -431,6 +423,9 @@ public ExistsAliasRequest build() {
 				if (request.allowNoIndices != null) {
 					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
 				}
+				if (request.local != null) {
+					params.put("local", String.valueOf(request.local));
+				}
 				return params;
 
 			}, SimpleEndpoint.emptyMap(), false, null);
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetAliasRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetAliasRequest.java
index 4e1d9c815..d8d19b1c5 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetAliasRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/GetAliasRequest.java
@@ -22,7 +22,6 @@
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
 import co.elastic.clients.elasticsearch._types.ExpandWildcard;
 import co.elastic.clients.elasticsearch._types.RequestBase;
-import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
@@ -79,7 +78,7 @@ public class GetAliasRequest extends RequestBase {
 	private final List<String> index;
 
 	@Nullable
-	private final Time masterTimeout;
+	private final Boolean local;
 
 	private final List<String> name;
 
@@ -91,7 +90,7 @@ private GetAliasRequest(Builder builder) {
 		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
 		this.ignoreUnavailable = builder.ignoreUnavailable;
 		this.index = ApiTypeHelper.unmodifiable(builder.index);
-		this.masterTimeout = builder.masterTimeout;
+		this.local = builder.local;
 		this.name = ApiTypeHelper.unmodifiable(builder.name);
 
 	}
@@ -150,14 +149,17 @@ public final List<String> index() {
 	}
 
 	/**
-	 * Period to wait for a connection to the master node. If no response is
-	 * received before the timeout expires, the request fails and returns an error.
+	 * If <code>true</code>, the request retrieves information from the local node
+	 * only.
 	 * <p>
-	 * API name: {@code master_timeout}
+	 * API name: {@code local}
+	 * 
+	 * @deprecated 8.12.0
 	 */
+	@Deprecated
 	@Nullable
-	public final Time masterTimeout() {
-		return this.masterTimeout;
+	public final Boolean local() {
+		return this.local;
 	}
 
 	/**
@@ -191,7 +193,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
 		private List<String> index;
 
 		@Nullable
-		private Time masterTimeout;
+		private Boolean local;
 
 		@Nullable
 		private List<String> name;
@@ -283,26 +285,19 @@ public final Builder index(String value, String... values) {
 		}
 
 		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
+		 * If <code>true</code>, the request retrieves information from the local node
+		 * only.
 		 * <p>
-		 * API name: {@code master_timeout}
+		 * API name: {@code local}
+		 * 
+		 * @deprecated 8.12.0
 		 */
-		public final Builder masterTimeout(@Nullable Time value) {
-			this.masterTimeout = value;
+		@Deprecated
+		public final Builder local(@Nullable Boolean value) {
+			this.local = value;
 			return this;
 		}
 
-		/**
-		 * Period to wait for a connection to the master node. If no response is
-		 * received before the timeout expires, the request fails and returns an error.
-		 * <p>
-		 * API name: {@code master_timeout}
-		 */
-		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
-			return this.masterTimeout(fn.apply(new Time.Builder()).build());
-		}
-
 		/**
 		 * Comma-separated list of aliases to retrieve. Supports wildcards
 		 * (<code>*</code>). To retrieve all aliases, omit this parameter or use
@@ -438,9 +433,6 @@ public GetAliasRequest build() {
 			// Request parameters
 			request -> {
 				Map<String, String> params = new HashMap<>();
-				if (request.masterTimeout != null) {
-					params.put("master_timeout", request.masterTimeout._toJsonString());
-				}
 				if (ApiTypeHelper.isDefined(request.expandWildcards)) {
 					params.put("expand_wildcards",
 							request.expandWildcards.stream().map(v -> v.jsonValue()).collect(Collectors.joining(",")));
@@ -451,6 +443,9 @@ public GetAliasRequest build() {
 				if (request.allowNoIndices != null) {
 					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
 				}
+				if (request.local != null) {
+					params.put("local", String.valueOf(request.local));
+				}
 				return params;
 
 			}, SimpleEndpoint.emptyMap(), false, GetAliasResponse._DESERIALIZER);
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataLifecycleRequest.java
index 52b6a95b6..00ad95dc1 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataLifecycleRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/PutDataLifecycleRequest.java
@@ -34,7 +34,6 @@
 import co.elastic.clients.util.ApiTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
-import jakarta.json.stream.JsonParser;
 import java.lang.String;
 import java.util.HashMap;
 import java.util.List;
@@ -71,6 +70,12 @@
  */
 @JsonpDeserializable
 public class PutDataLifecycleRequest extends RequestBase implements JsonpSerializable {
+	@Nullable
+	private final Time dataRetention;
+
+	@Nullable
+	private final DataStreamLifecycleDownsampling downsampling;
+
 	private final List<ExpandWildcard> expandWildcards;
 
 	@Nullable
@@ -81,17 +86,16 @@ public class PutDataLifecycleRequest extends RequestBase implements JsonpSeriali
 	@Nullable
 	private final Time timeout;
 
-	private final DataStreamLifecycle lifecycle;
-
 	// ---------------------------------------------------------------------------------------------
 
 	private PutDataLifecycleRequest(Builder builder) {
 
+		this.dataRetention = builder.dataRetention;
+		this.downsampling = builder.downsampling;
 		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
 		this.masterTimeout = builder.masterTimeout;
 		this.name = ApiTypeHelper.unmodifiableRequired(builder.name, this, "name");
 		this.timeout = builder.timeout;
-		this.lifecycle = ApiTypeHelper.requireNonNull(builder.lifecycle, this, "lifecycle");
 
 	}
 
@@ -99,6 +103,31 @@ public static PutDataLifecycleRequest of(Function<Builder, ObjectBuilder<PutData
 		return fn.apply(new Builder()).build();
 	}
 
+	/**
+	 * If defined, every document added to this data stream will be stored at least
+	 * for this time frame. Any time after this duration the document could be
+	 * deleted. When empty, every document in this data stream will be stored
+	 * indefinitely.
+	 * <p>
+	 * API name: {@code data_retention}
+	 */
+	@Nullable
+	public final Time dataRetention() {
+		return this.dataRetention;
+	}
+
+	/**
+	 * If defined, every backing index will execute the configured downsampling
+	 * configuration after the backing index is not the data stream write index
+	 * anymore.
+	 * <p>
+	 * API name: {@code downsampling}
+	 */
+	@Nullable
+	public final DataStreamLifecycleDownsampling downsampling() {
+		return this.downsampling;
+	}
+
 	/**
 	 * Type of data stream that wildcard patterns can match. Supports
 	 * comma-separated values, such as <code>open,hidden</code>. Valid values are:
@@ -145,17 +174,26 @@ public final Time timeout() {
 	}
 
 	/**
-	 * Required - Request body.
+	 * Serialize this object to JSON.
 	 */
-	public final DataStreamLifecycle lifecycle() {
-		return this.lifecycle;
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+		generator.writeStartObject();
+		serializeInternal(generator, mapper);
+		generator.writeEnd();
 	}
 
-	/**
-	 * Serialize this value to JSON.
-	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		this.lifecycle.serialize(generator, mapper);
+	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+		if (this.dataRetention != null) {
+			generator.writeKey("data_retention");
+			this.dataRetention.serialize(generator, mapper);
+
+		}
+		if (this.downsampling != null) {
+			generator.writeKey("downsampling");
+			this.downsampling.serialize(generator, mapper);
+
+		}
 
 	}
 
@@ -168,6 +206,12 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 	public static class Builder extends RequestBase.AbstractBuilder<Builder>
 			implements
 				ObjectBuilder<PutDataLifecycleRequest> {
+		@Nullable
+		private Time dataRetention;
+
+		@Nullable
+		private DataStreamLifecycleDownsampling downsampling;
+
 		@Nullable
 		private List<ExpandWildcard> expandWildcards;
 
@@ -179,7 +223,54 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
 		@Nullable
 		private Time timeout;
 
-		private DataStreamLifecycle lifecycle;
+		/**
+		 * If defined, every document added to this data stream will be stored at least
+		 * for this time frame. Any time after this duration the document could be
+		 * deleted. When empty, every document in this data stream will be stored
+		 * indefinitely.
+		 * <p>
+		 * API name: {@code data_retention}
+		 */
+		public final Builder dataRetention(@Nullable Time value) {
+			this.dataRetention = value;
+			return this;
+		}
+
+		/**
+		 * If defined, every document added to this data stream will be stored at least
+		 * for this time frame. Any time after this duration the document could be
+		 * deleted. When empty, every document in this data stream will be stored
+		 * indefinitely.
+		 * <p>
+		 * API name: {@code data_retention}
+		 */
+		public final Builder dataRetention(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.dataRetention(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * If defined, every backing index will execute the configured downsampling
+		 * configuration after the backing index is not the data stream write index
+		 * anymore.
+		 * <p>
+		 * API name: {@code downsampling}
+		 */
+		public final Builder downsampling(@Nullable DataStreamLifecycleDownsampling value) {
+			this.downsampling = value;
+			return this;
+		}
+
+		/**
+		 * If defined, every backing index will execute the configured downsampling
+		 * configuration after the backing index is not the data stream write index
+		 * anymore.
+		 * <p>
+		 * API name: {@code downsampling}
+		 */
+		public final Builder downsampling(
+				Function<DataStreamLifecycleDownsampling.Builder, ObjectBuilder<DataStreamLifecycleDownsampling>> fn) {
+			return this.downsampling(fn.apply(new DataStreamLifecycleDownsampling.Builder()).build());
+		}
 
 		/**
 		 * Type of data stream that wildcard patterns can match. Supports
@@ -281,30 +372,6 @@ public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
 			return this.timeout(fn.apply(new Time.Builder()).build());
 		}
 
-		/**
-		 * Required - Request body.
-		 */
-		public final Builder lifecycle(DataStreamLifecycle value) {
-			this.lifecycle = value;
-			return this;
-		}
-
-		/**
-		 * Required - Request body.
-		 */
-		public final Builder lifecycle(Function<DataStreamLifecycle.Builder, ObjectBuilder<DataStreamLifecycle>> fn) {
-			return this.lifecycle(fn.apply(new DataStreamLifecycle.Builder()).build());
-		}
-
-		@Override
-		public Builder withJson(JsonParser parser, JsonpMapper mapper) {
-
-			@SuppressWarnings("unchecked")
-			DataStreamLifecycle value = (DataStreamLifecycle) DataStreamLifecycle._DESERIALIZER.deserialize(parser,
-					mapper);
-			return this.lifecycle(value);
-		}
-
 		@Override
 		protected Builder self() {
 			return this;
@@ -323,13 +390,20 @@ public PutDataLifecycleRequest build() {
 		}
 	}
 
-	public static final JsonpDeserializer<PutDataLifecycleRequest> _DESERIALIZER = createPutDataLifecycleRequestDeserializer();
-	protected static JsonpDeserializer<PutDataLifecycleRequest> createPutDataLifecycleRequestDeserializer() {
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Json deserializer for {@link PutDataLifecycleRequest}
+	 */
+	public static final JsonpDeserializer<PutDataLifecycleRequest> _DESERIALIZER = ObjectBuilderDeserializer
+			.lazy(Builder::new, PutDataLifecycleRequest::setupPutDataLifecycleRequestDeserializer);
+
+	protected static void setupPutDataLifecycleRequestDeserializer(
+			ObjectDeserializer<PutDataLifecycleRequest.Builder> op) {
 
-		JsonpDeserializer<DataStreamLifecycle> valueDeserializer = DataStreamLifecycle._DESERIALIZER;
+		op.add(Builder::dataRetention, Time._DESERIALIZER, "data_retention");
+		op.add(Builder::downsampling, DataStreamLifecycleDownsampling._DESERIALIZER, "downsampling");
 
-		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper, event) -> new Builder()
-				.lifecycle(valueDeserializer.deserialize(parser, mapper, event)).build());
 	}
 
 	// ---------------------------------------------------------------------------------------------
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/SegmentsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/SegmentsRequest.java
index 87cd28ed4..826c117d4 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/SegmentsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/SegmentsRequest.java
@@ -78,6 +78,9 @@ public class SegmentsRequest extends RequestBase {
 
 	private final List<String> index;
 
+	@Nullable
+	private final Boolean verbose;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private SegmentsRequest(Builder builder) {
@@ -86,6 +89,7 @@ private SegmentsRequest(Builder builder) {
 		this.expandWildcards = ApiTypeHelper.unmodifiable(builder.expandWildcards);
 		this.ignoreUnavailable = builder.ignoreUnavailable;
 		this.index = ApiTypeHelper.unmodifiable(builder.index);
+		this.verbose = builder.verbose;
 
 	}
 
@@ -142,6 +146,16 @@ public final List<String> index() {
 		return this.index;
 	}
 
+	/**
+	 * If <code>true</code>, the request returns a verbose response.
+	 * <p>
+	 * API name: {@code verbose}
+	 */
+	@Nullable
+	public final Boolean verbose() {
+		return this.verbose;
+	}
+
 	// ---------------------------------------------------------------------------------------------
 
 	/**
@@ -161,6 +175,9 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
 		@Nullable
 		private List<String> index;
 
+		@Nullable
+		private Boolean verbose;
+
 		/**
 		 * If <code>false</code>, the request returns an error if any wildcard
 		 * expression, index alias, or <code>_all</code> value targets only missing or
@@ -247,6 +264,16 @@ public final Builder index(String value, String... values) {
 			return this;
 		}
 
+		/**
+		 * If <code>true</code>, the request returns a verbose response.
+		 * <p>
+		 * API name: {@code verbose}
+		 */
+		public final Builder verbose(@Nullable Boolean value) {
+			this.verbose = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -335,6 +362,9 @@ public SegmentsRequest build() {
 				if (request.allowNoIndices != null) {
 					params.put("allow_no_indices", String.valueOf(request.allowNoIndices));
 				}
+				if (request.verbose != null) {
+					params.put("verbose", String.valueOf(request.verbose));
+				}
 				return params;
 
 			}, SimpleEndpoint.emptyMap(), false, SegmentsResponse._DESERIALIZER);
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/get_data_lifecycle/DataStreamWithLifecycle.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/get_data_lifecycle/DataStreamWithLifecycle.java
index 4a1ae5cdf..c0f1c5612 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/get_data_lifecycle/DataStreamWithLifecycle.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/get_data_lifecycle/DataStreamWithLifecycle.java
@@ -19,7 +19,7 @@
 
 package co.elastic.clients.elasticsearch.indices.get_data_lifecycle;
 
-import co.elastic.clients.elasticsearch.indices.DataStreamLifecycleWithRollover;
+import co.elastic.clients.elasticsearch.indices.DataStreamLifecycle;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
@@ -64,7 +64,7 @@ public class DataStreamWithLifecycle implements JsonpSerializable {
 	private final String name;
 
 	@Nullable
-	private final DataStreamLifecycleWithRollover lifecycle;
+	private final DataStreamLifecycle lifecycle;
 
 	// ---------------------------------------------------------------------------------------------
 
@@ -90,7 +90,7 @@ public final String name() {
 	 * API name: {@code lifecycle}
 	 */
 	@Nullable
-	public final DataStreamLifecycleWithRollover lifecycle() {
+	public final DataStreamLifecycle lifecycle() {
 		return this.lifecycle;
 	}
 
@@ -133,7 +133,7 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder>
 		private String name;
 
 		@Nullable
-		private DataStreamLifecycleWithRollover lifecycle;
+		private DataStreamLifecycle lifecycle;
 
 		/**
 		 * Required - API name: {@code name}
@@ -146,7 +146,7 @@ public final Builder name(String value) {
 		/**
 		 * API name: {@code lifecycle}
 		 */
-		public final Builder lifecycle(@Nullable DataStreamLifecycleWithRollover value) {
+		public final Builder lifecycle(@Nullable DataStreamLifecycle value) {
 			this.lifecycle = value;
 			return this;
 		}
@@ -154,9 +154,8 @@ public final Builder lifecycle(@Nullable DataStreamLifecycleWithRollover value)
 		/**
 		 * API name: {@code lifecycle}
 		 */
-		public final Builder lifecycle(
-				Function<DataStreamLifecycleWithRollover.Builder, ObjectBuilder<DataStreamLifecycleWithRollover>> fn) {
-			return this.lifecycle(fn.apply(new DataStreamLifecycleWithRollover.Builder()).build());
+		public final Builder lifecycle(Function<DataStreamLifecycle.Builder, ObjectBuilder<DataStreamLifecycle>> fn) {
+			return this.lifecycle(fn.apply(new DataStreamLifecycle.Builder()).build());
 		}
 
 		@Override
@@ -189,7 +188,7 @@ protected static void setupDataStreamWithLifecycleDeserializer(
 			ObjectDeserializer<DataStreamWithLifecycle.Builder> op) {
 
 		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
-		op.add(Builder::lifecycle, DataStreamLifecycleWithRollover._DESERIALIZER, "lifecycle");
+		op.add(Builder::lifecycle, DataStreamLifecycle._DESERIALIZER, "lifecycle");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceAsyncClient.java
index 12346a688..64685ed53 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceAsyncClient.java
@@ -182,25 +182,7 @@ public final CompletableFuture<InferenceResponse> inference(
 	// ----- Endpoint: inference.put
 
 	/**
-	 * Create an inference endpoint. When you create an inference endpoint, the
-	 * associated machine learning model is automatically deployed if it is not
-	 * already running. After creating the endpoint, wait for the model deployment
-	 * to complete before using it. To verify the deployment status, use the get
-	 * trained model statistics API. Look for
-	 * <code>&quot;state&quot;: &quot;fully_allocated&quot;</code> in the response
-	 * and ensure that the <code>&quot;allocation_count&quot;</code> matches the
-	 * <code>&quot;target_allocation_count&quot;</code>. Avoid creating multiple
-	 * endpoints for the same model unless required, as each endpoint consumes
-	 * significant resources.
-	 * <p>
-	 * IMPORTANT: The inference APIs enable you to use certain services, such as
-	 * built-in machine learning models (ELSER, E5), models uploaded through Eland,
-	 * Cohere, OpenAI, Mistral, Azure OpenAI, Google AI Studio, Google Vertex AI,
-	 * Anthropic, Watsonx.ai, or Hugging Face. For built-in models and models
-	 * uploaded through Eland, the inference APIs offer an alternative way to use
-	 * and manage trained models. However, if you do not plan to use the inference
-	 * APIs to use these models or if you want to use non-NLP models, use the
-	 * machine learning trained model APIs.
+	 * Create an inference endpoint
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-inference-api.html">Documentation
@@ -215,25 +197,7 @@ public CompletableFuture<PutResponse> put(PutRequest request) {
 	}
 
 	/**
-	 * Create an inference endpoint. When you create an inference endpoint, the
-	 * associated machine learning model is automatically deployed if it is not
-	 * already running. After creating the endpoint, wait for the model deployment
-	 * to complete before using it. To verify the deployment status, use the get
-	 * trained model statistics API. Look for
-	 * <code>&quot;state&quot;: &quot;fully_allocated&quot;</code> in the response
-	 * and ensure that the <code>&quot;allocation_count&quot;</code> matches the
-	 * <code>&quot;target_allocation_count&quot;</code>. Avoid creating multiple
-	 * endpoints for the same model unless required, as each endpoint consumes
-	 * significant resources.
-	 * <p>
-	 * IMPORTANT: The inference APIs enable you to use certain services, such as
-	 * built-in machine learning models (ELSER, E5), models uploaded through Eland,
-	 * Cohere, OpenAI, Mistral, Azure OpenAI, Google AI Studio, Google Vertex AI,
-	 * Anthropic, Watsonx.ai, or Hugging Face. For built-in models and models
-	 * uploaded through Eland, the inference APIs offer an alternative way to use
-	 * and manage trained models. However, if you do not plan to use the inference
-	 * APIs to use these models or if you want to use non-NLP models, use the
-	 * machine learning trained model APIs.
+	 * Create an inference endpoint
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceClient.java
index 9910b5717..753d3646c 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/ElasticsearchInferenceClient.java
@@ -181,25 +181,7 @@ public final InferenceResponse inference(Function<InferenceRequest.Builder, Obje
 	// ----- Endpoint: inference.put
 
 	/**
-	 * Create an inference endpoint. When you create an inference endpoint, the
-	 * associated machine learning model is automatically deployed if it is not
-	 * already running. After creating the endpoint, wait for the model deployment
-	 * to complete before using it. To verify the deployment status, use the get
-	 * trained model statistics API. Look for
-	 * <code>&quot;state&quot;: &quot;fully_allocated&quot;</code> in the response
-	 * and ensure that the <code>&quot;allocation_count&quot;</code> matches the
-	 * <code>&quot;target_allocation_count&quot;</code>. Avoid creating multiple
-	 * endpoints for the same model unless required, as each endpoint consumes
-	 * significant resources.
-	 * <p>
-	 * IMPORTANT: The inference APIs enable you to use certain services, such as
-	 * built-in machine learning models (ELSER, E5), models uploaded through Eland,
-	 * Cohere, OpenAI, Mistral, Azure OpenAI, Google AI Studio, Google Vertex AI,
-	 * Anthropic, Watsonx.ai, or Hugging Face. For built-in models and models
-	 * uploaded through Eland, the inference APIs offer an alternative way to use
-	 * and manage trained models. However, if you do not plan to use the inference
-	 * APIs to use these models or if you want to use non-NLP models, use the
-	 * machine learning trained model APIs.
+	 * Create an inference endpoint
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-inference-api.html">Documentation
@@ -214,25 +196,7 @@ public PutResponse put(PutRequest request) throws IOException, ElasticsearchExce
 	}
 
 	/**
-	 * Create an inference endpoint. When you create an inference endpoint, the
-	 * associated machine learning model is automatically deployed if it is not
-	 * already running. After creating the endpoint, wait for the model deployment
-	 * to complete before using it. To verify the deployment status, use the get
-	 * trained model statistics API. Look for
-	 * <code>&quot;state&quot;: &quot;fully_allocated&quot;</code> in the response
-	 * and ensure that the <code>&quot;allocation_count&quot;</code> matches the
-	 * <code>&quot;target_allocation_count&quot;</code>. Avoid creating multiple
-	 * endpoints for the same model unless required, as each endpoint consumes
-	 * significant resources.
-	 * <p>
-	 * IMPORTANT: The inference APIs enable you to use certain services, such as
-	 * built-in machine learning models (ELSER, E5), models uploaded through Eland,
-	 * Cohere, OpenAI, Mistral, Azure OpenAI, Google AI Studio, Google Vertex AI,
-	 * Anthropic, Watsonx.ai, or Hugging Face. For built-in models and models
-	 * uploaded through Eland, the inference APIs offer an alternative way to use
-	 * and manage trained models. However, if you do not plan to use the inference
-	 * APIs to use these models or if you want to use non-NLP models, use the
-	 * machine learning trained model APIs.
+	 * Create an inference endpoint
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/PutRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/PutRequest.java
index 6f734f226..3de1fbd28 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/PutRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/inference/PutRequest.java
@@ -59,25 +59,7 @@
 // typedef: inference.put.Request
 
 /**
- * Create an inference endpoint. When you create an inference endpoint, the
- * associated machine learning model is automatically deployed if it is not
- * already running. After creating the endpoint, wait for the model deployment
- * to complete before using it. To verify the deployment status, use the get
- * trained model statistics API. Look for
- * <code>&quot;state&quot;: &quot;fully_allocated&quot;</code> in the response
- * and ensure that the <code>&quot;allocation_count&quot;</code> matches the
- * <code>&quot;target_allocation_count&quot;</code>. Avoid creating multiple
- * endpoints for the same model unless required, as each endpoint consumes
- * significant resources.
- * <p>
- * IMPORTANT: The inference APIs enable you to use certain services, such as
- * built-in machine learning models (ELSER, E5), models uploaded through Eland,
- * Cohere, OpenAI, Mistral, Azure OpenAI, Google AI Studio, Google Vertex AI,
- * Anthropic, Watsonx.ai, or Hugging Face. For built-in models and models
- * uploaded through Eland, the inference APIs offer an alternative way to use
- * and manage trained models. However, if you do not plan to use the inference
- * APIs to use these models or if you want to use non-NLP models, use the
- * machine learning trained model APIs.
+ * Create an inference endpoint
  * 
  * @see <a href="../doc-files/api-spec.html#inference.put.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfiguration.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfiguration.java
index 63a428ed8..0314ef484 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfiguration.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfiguration.java
@@ -19,6 +19,7 @@
 
 package co.elastic.clients.elasticsearch.ingest;
 
+import co.elastic.clients.json.JsonEnum;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
@@ -28,8 +29,11 @@
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
+import co.elastic.clients.util.TaggedUnion;
+import co.elastic.clients.util.TaggedUnionUtils;
 import co.elastic.clients.util.WithJsonObjectBuilderBase;
 import jakarta.json.stream.JsonGenerator;
+import java.lang.Object;
 import java.lang.String;
 import java.util.Objects;
 import java.util.function.Function;
@@ -53,23 +57,69 @@
 // typedef: ingest._types.DatabaseConfiguration
 
 /**
- *
+ * The configuration necessary to identify which IP geolocation provider to use
+ * to download a database, as well as any provider-specific configuration
+ * necessary for such downloading. At present, the only supported providers are
+ * maxmind and ipinfo, and the maxmind provider requires that an account_id
+ * (string) is configured. A provider (either maxmind or ipinfo) must be
+ * specified. The web and local providers can be returned as read only
+ * configurations.
+ * 
  * @see <a href=
  *      "../doc-files/api-spec.html#ingest._types.DatabaseConfiguration">API
  *      specification</a>
  */
 @JsonpDeserializable
-public class DatabaseConfiguration implements JsonpSerializable {
-	private final String name;
+public class DatabaseConfiguration implements TaggedUnion<DatabaseConfiguration.Kind, Object>, JsonpSerializable {
+
+	/**
+	 * {@link DatabaseConfiguration} variant kinds.
+	 * 
+	 * @see <a href=
+	 *      "../doc-files/api-spec.html#ingest._types.DatabaseConfiguration">API
+	 *      specification</a>
+	 */
 
-	private final Maxmind maxmind;
+	public enum Kind implements JsonEnum {
+		Maxmind("maxmind"),
 
-	// ---------------------------------------------------------------------------------------------
+		Ipinfo("ipinfo"),
+
+		;
+
+		private final String jsonValue;
+
+		Kind(String jsonValue) {
+			this.jsonValue = jsonValue;
+		}
+
+		public String jsonValue() {
+			return this.jsonValue;
+		}
+
+	}
+
+	private final Kind _kind;
+	private final Object _value;
+
+	@Override
+	public final Kind _kind() {
+		return _kind;
+	}
+
+	@Override
+	public final Object _get() {
+		return _value;
+	}
+
+	private final String name;
 
 	private DatabaseConfiguration(Builder builder) {
 
+		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
 		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
-		this.maxmind = ApiTypeHelper.requireNonNull(builder.maxmind, this, "maxmind");
 
 	}
 
@@ -88,34 +138,54 @@ public final String name() {
 	}
 
 	/**
-	 * Required - The configuration necessary to identify which IP geolocation
-	 * provider to use to download the database, as well as any provider-specific
-	 * configuration necessary for such downloading. At present, the only supported
-	 * provider is maxmind, and the maxmind provider requires that an account_id
-	 * (string) is configured.
-	 * <p>
-	 * API name: {@code maxmind}
+	 * Is this variant instance of kind {@code maxmind}?
 	 */
-	public final Maxmind maxmind() {
-		return this.maxmind;
+	public boolean isMaxmind() {
+		return _kind == Kind.Maxmind;
 	}
 
 	/**
-	 * Serialize this object to JSON.
+	 * Get the {@code maxmind} variant value.
+	 *
+	 * @throws IllegalStateException
+	 *             if the current variant is not of the {@code maxmind} kind.
 	 */
-	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
-		generator.writeStartObject();
-		serializeInternal(generator, mapper);
-		generator.writeEnd();
+	public Maxmind maxmind() {
+		return TaggedUnionUtils.get(this, Kind.Maxmind);
+	}
+
+	/**
+	 * Is this variant instance of kind {@code ipinfo}?
+	 */
+	public boolean isIpinfo() {
+		return _kind == Kind.Ipinfo;
 	}
 
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+	/**
+	 * Get the {@code ipinfo} variant value.
+	 *
+	 * @throws IllegalStateException
+	 *             if the current variant is not of the {@code ipinfo} kind.
+	 */
+	public Ipinfo ipinfo() {
+		return TaggedUnionUtils.get(this, Kind.Ipinfo);
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+		generator.writeStartObject();
 
 		generator.writeKey("name");
 		generator.write(this.name);
 
-		generator.writeKey("maxmind");
-		this.maxmind.serialize(generator, mapper);
+		generator.writeKey(_kind.jsonValue());
+		if (_value instanceof JsonpSerializable) {
+			((JsonpSerializable) _value).serialize(generator, mapper);
+		}
+
+		generator.writeEnd();
 
 	}
 
@@ -124,18 +194,13 @@ public String toString() {
 		return JsonpUtils.toString(this);
 	}
 
-	// ---------------------------------------------------------------------------------------------
-
-	/**
-	 * Builder for {@link DatabaseConfiguration}.
-	 */
-
 	public static class Builder extends WithJsonObjectBuilderBase<Builder>
 			implements
 				ObjectBuilder<DatabaseConfiguration> {
-		private String name;
+		private Kind _kind;
+		private Object _value;
 
-		private Maxmind maxmind;
+		private String name;
 
 		/**
 		 * Required - The provider-assigned name of the IP geolocation database to
@@ -148,64 +213,62 @@ public final Builder name(String value) {
 			return this;
 		}
 
-		/**
-		 * Required - The configuration necessary to identify which IP geolocation
-		 * provider to use to download the database, as well as any provider-specific
-		 * configuration necessary for such downloading. At present, the only supported
-		 * provider is maxmind, and the maxmind provider requires that an account_id
-		 * (string) is configured.
-		 * <p>
-		 * API name: {@code maxmind}
-		 */
-		public final Builder maxmind(Maxmind value) {
-			this.maxmind = value;
+		@Override
+		protected Builder self() {
 			return this;
 		}
+		public ContainerBuilder maxmind(Maxmind v) {
+			this._kind = Kind.Maxmind;
+			this._value = v;
+			return new ContainerBuilder();
+		}
 
-		/**
-		 * Required - The configuration necessary to identify which IP geolocation
-		 * provider to use to download the database, as well as any provider-specific
-		 * configuration necessary for such downloading. At present, the only supported
-		 * provider is maxmind, and the maxmind provider requires that an account_id
-		 * (string) is configured.
-		 * <p>
-		 * API name: {@code maxmind}
-		 */
-		public final Builder maxmind(Function<Maxmind.Builder, ObjectBuilder<Maxmind>> fn) {
+		public ContainerBuilder maxmind(Function<Maxmind.Builder, ObjectBuilder<Maxmind>> fn) {
 			return this.maxmind(fn.apply(new Maxmind.Builder()).build());
 		}
 
-		@Override
-		protected Builder self() {
-			return this;
+		public ContainerBuilder ipinfo(Ipinfo v) {
+			this._kind = Kind.Ipinfo;
+			this._value = v;
+			return new ContainerBuilder();
+		}
+
+		public ContainerBuilder ipinfo(Function<Ipinfo.Builder, ObjectBuilder<Ipinfo>> fn) {
+			return this.ipinfo(fn.apply(new Ipinfo.Builder()).build());
 		}
 
-		/**
-		 * Builds a {@link DatabaseConfiguration}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
 		public DatabaseConfiguration build() {
 			_checkSingleUse();
-
 			return new DatabaseConfiguration(this);
 		}
-	}
-
-	// ---------------------------------------------------------------------------------------------
 
-	/**
-	 * Json deserializer for {@link DatabaseConfiguration}
-	 */
-	public static final JsonpDeserializer<DatabaseConfiguration> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, DatabaseConfiguration::setupDatabaseConfigurationDeserializer);
+		public class ContainerBuilder implements ObjectBuilder<DatabaseConfiguration> {
+
+			/**
+			 * Required - The provider-assigned name of the IP geolocation database to
+			 * download.
+			 * <p>
+			 * API name: {@code name}
+			 */
+			public final ContainerBuilder name(String value) {
+				Builder.this.name = value;
+				return this;
+			}
+
+			public DatabaseConfiguration build() {
+				return Builder.this.build();
+			}
+		}
+	}
 
-	protected static void setupDatabaseConfigurationDeserializer(ObjectDeserializer<DatabaseConfiguration.Builder> op) {
+	protected static void setupDatabaseConfigurationDeserializer(ObjectDeserializer<Builder> op) {
 
 		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
 		op.add(Builder::maxmind, Maxmind._DESERIALIZER, "maxmind");
+		op.add(Builder::ipinfo, Ipinfo._DESERIALIZER, "ipinfo");
 
 	}
 
+	public static final JsonpDeserializer<DatabaseConfiguration> _DESERIALIZER = ObjectBuilderDeserializer
+			.lazy(Builder::new, DatabaseConfiguration::setupDatabaseConfigurationDeserializer, Builder::build);
 }
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationBuilders.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationBuilders.java
new file mode 100644
index 000000000..17cbd004c
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationBuilders.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+import co.elastic.clients.util.ObjectBuilder;
+import java.util.function.Function;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+/**
+ * Builders for {@link DatabaseConfiguration} variants.
+ */
+public class DatabaseConfigurationBuilders {
+	private DatabaseConfigurationBuilders() {
+	}
+
+	/**
+	 * Creates a builder for the {@link Maxmind maxmind}
+	 * {@code DatabaseConfiguration} variant.
+	 */
+	public static Maxmind.Builder maxmind() {
+		return new Maxmind.Builder();
+	}
+
+	/**
+	 * Creates a DatabaseConfiguration of the {@link Maxmind maxmind}
+	 * {@code DatabaseConfiguration} variant.
+	 */
+	public static DatabaseConfiguration maxmind(Function<Maxmind.Builder, ObjectBuilder<Maxmind>> fn) {
+		DatabaseConfiguration.Builder builder = new DatabaseConfiguration.Builder();
+		builder.maxmind(fn.apply(new Maxmind.Builder()).build());
+		return builder.build();
+	}
+
+	/**
+	 * Creates a builder for the {@link Ipinfo ipinfo} {@code DatabaseConfiguration}
+	 * variant.
+	 */
+	public static Ipinfo.Builder ipinfo() {
+		return new Ipinfo.Builder();
+	}
+
+	/**
+	 * Creates a DatabaseConfiguration of the {@link Ipinfo ipinfo}
+	 * {@code DatabaseConfiguration} variant.
+	 */
+	public static DatabaseConfiguration ipinfo(Function<Ipinfo.Builder, ObjectBuilder<Ipinfo>> fn) {
+		DatabaseConfiguration.Builder builder = new DatabaseConfiguration.Builder();
+		builder.ipinfo(fn.apply(new Ipinfo.Builder()).build());
+		return builder.build();
+	}
+
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFull.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFull.java
new file mode 100644
index 000000000..4c7c399a9
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFull.java
@@ -0,0 +1,330 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+import co.elastic.clients.json.JsonEnum;
+import co.elastic.clients.json.JsonpDeserializable;
+import co.elastic.clients.json.JsonpDeserializer;
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
+import co.elastic.clients.json.ObjectBuilderDeserializer;
+import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.ObjectBuilder;
+import co.elastic.clients.util.TaggedUnion;
+import co.elastic.clients.util.TaggedUnionUtils;
+import co.elastic.clients.util.WithJsonObjectBuilderBase;
+import jakarta.json.stream.JsonGenerator;
+import java.lang.Object;
+import java.lang.String;
+import java.util.Objects;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+// typedef: ingest._types.DatabaseConfigurationFull
+
+/**
+ *
+ * @see <a href=
+ *      "../doc-files/api-spec.html#ingest._types.DatabaseConfigurationFull">API
+ *      specification</a>
+ */
+@JsonpDeserializable
+public class DatabaseConfigurationFull
+		implements
+			TaggedUnion<DatabaseConfigurationFull.Kind, Object>,
+			JsonpSerializable {
+
+	/**
+	 * {@link DatabaseConfigurationFull} variant kinds.
+	 * 
+	 * @see <a href=
+	 *      "../doc-files/api-spec.html#ingest._types.DatabaseConfigurationFull">API
+	 *      specification</a>
+	 */
+
+	public enum Kind implements JsonEnum {
+		Web("web"),
+
+		Local("local"),
+
+		Maxmind("maxmind"),
+
+		Ipinfo("ipinfo"),
+
+		;
+
+		private final String jsonValue;
+
+		Kind(String jsonValue) {
+			this.jsonValue = jsonValue;
+		}
+
+		public String jsonValue() {
+			return this.jsonValue;
+		}
+
+	}
+
+	private final Kind _kind;
+	private final Object _value;
+
+	@Override
+	public final Kind _kind() {
+		return _kind;
+	}
+
+	@Override
+	public final Object _get() {
+		return _value;
+	}
+
+	private final String name;
+
+	private DatabaseConfigurationFull(Builder builder) {
+
+		this._kind = ApiTypeHelper.requireNonNull(builder._kind, builder, "<variant kind>");
+		this._value = ApiTypeHelper.requireNonNull(builder._value, builder, "<variant value>");
+
+		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+
+	}
+
+	public static DatabaseConfigurationFull of(Function<Builder, ObjectBuilder<DatabaseConfigurationFull>> fn) {
+		return fn.apply(new Builder()).build();
+	}
+
+	/**
+	 * Required - The provider-assigned name of the IP geolocation database to
+	 * download.
+	 * <p>
+	 * API name: {@code name}
+	 */
+	public final String name() {
+		return this.name;
+	}
+
+	/**
+	 * Is this variant instance of kind {@code web}?
+	 */
+	public boolean isWeb() {
+		return _kind == Kind.Web;
+	}
+
+	/**
+	 * Get the {@code web} variant value.
+	 *
+	 * @throws IllegalStateException
+	 *             if the current variant is not of the {@code web} kind.
+	 */
+	public Web web() {
+		return TaggedUnionUtils.get(this, Kind.Web);
+	}
+
+	/**
+	 * Is this variant instance of kind {@code local}?
+	 */
+	public boolean isLocal() {
+		return _kind == Kind.Local;
+	}
+
+	/**
+	 * Get the {@code local} variant value.
+	 *
+	 * @throws IllegalStateException
+	 *             if the current variant is not of the {@code local} kind.
+	 */
+	public Local local() {
+		return TaggedUnionUtils.get(this, Kind.Local);
+	}
+
+	/**
+	 * Is this variant instance of kind {@code maxmind}?
+	 */
+	public boolean isMaxmind() {
+		return _kind == Kind.Maxmind;
+	}
+
+	/**
+	 * Get the {@code maxmind} variant value.
+	 *
+	 * @throws IllegalStateException
+	 *             if the current variant is not of the {@code maxmind} kind.
+	 */
+	public Maxmind maxmind() {
+		return TaggedUnionUtils.get(this, Kind.Maxmind);
+	}
+
+	/**
+	 * Is this variant instance of kind {@code ipinfo}?
+	 */
+	public boolean isIpinfo() {
+		return _kind == Kind.Ipinfo;
+	}
+
+	/**
+	 * Get the {@code ipinfo} variant value.
+	 *
+	 * @throws IllegalStateException
+	 *             if the current variant is not of the {@code ipinfo} kind.
+	 */
+	public Ipinfo ipinfo() {
+		return TaggedUnionUtils.get(this, Kind.Ipinfo);
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+
+		generator.writeStartObject();
+
+		generator.writeKey("name");
+		generator.write(this.name);
+
+		generator.writeKey(_kind.jsonValue());
+		if (_value instanceof JsonpSerializable) {
+			((JsonpSerializable) _value).serialize(generator, mapper);
+		}
+
+		generator.writeEnd();
+
+	}
+
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
+	public static class Builder extends WithJsonObjectBuilderBase<Builder>
+			implements
+				ObjectBuilder<DatabaseConfigurationFull> {
+		private Kind _kind;
+		private Object _value;
+
+		private String name;
+
+		/**
+		 * Required - The provider-assigned name of the IP geolocation database to
+		 * download.
+		 * <p>
+		 * API name: {@code name}
+		 */
+		public final Builder name(String value) {
+			this.name = value;
+			return this;
+		}
+
+		@Override
+		protected Builder self() {
+			return this;
+		}
+		public ContainerBuilder web(Web v) {
+			this._kind = Kind.Web;
+			this._value = v;
+			return new ContainerBuilder();
+		}
+
+		public ContainerBuilder web(Function<Web.Builder, ObjectBuilder<Web>> fn) {
+			return this.web(fn.apply(new Web.Builder()).build());
+		}
+
+		public ContainerBuilder local(Local v) {
+			this._kind = Kind.Local;
+			this._value = v;
+			return new ContainerBuilder();
+		}
+
+		public ContainerBuilder local(Function<Local.Builder, ObjectBuilder<Local>> fn) {
+			return this.local(fn.apply(new Local.Builder()).build());
+		}
+
+		public ContainerBuilder maxmind(Maxmind v) {
+			this._kind = Kind.Maxmind;
+			this._value = v;
+			return new ContainerBuilder();
+		}
+
+		public ContainerBuilder maxmind(Function<Maxmind.Builder, ObjectBuilder<Maxmind>> fn) {
+			return this.maxmind(fn.apply(new Maxmind.Builder()).build());
+		}
+
+		public ContainerBuilder ipinfo(Ipinfo v) {
+			this._kind = Kind.Ipinfo;
+			this._value = v;
+			return new ContainerBuilder();
+		}
+
+		public ContainerBuilder ipinfo(Function<Ipinfo.Builder, ObjectBuilder<Ipinfo>> fn) {
+			return this.ipinfo(fn.apply(new Ipinfo.Builder()).build());
+		}
+
+		public DatabaseConfigurationFull build() {
+			_checkSingleUse();
+			return new DatabaseConfigurationFull(this);
+		}
+
+		public class ContainerBuilder implements ObjectBuilder<DatabaseConfigurationFull> {
+
+			/**
+			 * Required - The provider-assigned name of the IP geolocation database to
+			 * download.
+			 * <p>
+			 * API name: {@code name}
+			 */
+			public final ContainerBuilder name(String value) {
+				Builder.this.name = value;
+				return this;
+			}
+
+			public DatabaseConfigurationFull build() {
+				return Builder.this.build();
+			}
+		}
+	}
+
+	protected static void setupDatabaseConfigurationFullDeserializer(ObjectDeserializer<Builder> op) {
+
+		op.add(Builder::web, Web._DESERIALIZER, "web");
+		op.add(Builder::local, Local._DESERIALIZER, "local");
+		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+		op.add(Builder::maxmind, Maxmind._DESERIALIZER, "maxmind");
+		op.add(Builder::ipinfo, Ipinfo._DESERIALIZER, "ipinfo");
+
+	}
+
+	public static final JsonpDeserializer<DatabaseConfigurationFull> _DESERIALIZER = ObjectBuilderDeserializer
+			.lazy(Builder::new, DatabaseConfigurationFull::setupDatabaseConfigurationFullDeserializer, Builder::build);
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFullBuilders.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFullBuilders.java
new file mode 100644
index 000000000..f1b483a30
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFullBuilders.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+import co.elastic.clients.util.ObjectBuilder;
+import java.util.function.Function;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+/**
+ * Builders for {@link DatabaseConfigurationFull} variants.
+ */
+public class DatabaseConfigurationFullBuilders {
+	private DatabaseConfigurationFullBuilders() {
+	}
+
+	/**
+	 * Creates a builder for the {@link Web web} {@code DatabaseConfigurationFull}
+	 * variant.
+	 */
+	public static Web.Builder web() {
+		return new Web.Builder();
+	}
+
+	/**
+	 * Creates a DatabaseConfigurationFull of the {@link Web web}
+	 * {@code DatabaseConfigurationFull} variant.
+	 */
+	public static DatabaseConfigurationFull web(Function<Web.Builder, ObjectBuilder<Web>> fn) {
+		DatabaseConfigurationFull.Builder builder = new DatabaseConfigurationFull.Builder();
+		builder.web(fn.apply(new Web.Builder()).build());
+		return builder.build();
+	}
+
+	/**
+	 * Creates a builder for the {@link Local local}
+	 * {@code DatabaseConfigurationFull} variant.
+	 */
+	public static Local.Builder local() {
+		return new Local.Builder();
+	}
+
+	/**
+	 * Creates a DatabaseConfigurationFull of the {@link Local local}
+	 * {@code DatabaseConfigurationFull} variant.
+	 */
+	public static DatabaseConfigurationFull local(Function<Local.Builder, ObjectBuilder<Local>> fn) {
+		DatabaseConfigurationFull.Builder builder = new DatabaseConfigurationFull.Builder();
+		builder.local(fn.apply(new Local.Builder()).build());
+		return builder.build();
+	}
+
+	/**
+	 * Creates a builder for the {@link Maxmind maxmind}
+	 * {@code DatabaseConfigurationFull} variant.
+	 */
+	public static Maxmind.Builder maxmind() {
+		return new Maxmind.Builder();
+	}
+
+	/**
+	 * Creates a DatabaseConfigurationFull of the {@link Maxmind maxmind}
+	 * {@code DatabaseConfigurationFull} variant.
+	 */
+	public static DatabaseConfigurationFull maxmind(Function<Maxmind.Builder, ObjectBuilder<Maxmind>> fn) {
+		DatabaseConfigurationFull.Builder builder = new DatabaseConfigurationFull.Builder();
+		builder.maxmind(fn.apply(new Maxmind.Builder()).build());
+		return builder.build();
+	}
+
+	/**
+	 * Creates a builder for the {@link Ipinfo ipinfo}
+	 * {@code DatabaseConfigurationFull} variant.
+	 */
+	public static Ipinfo.Builder ipinfo() {
+		return new Ipinfo.Builder();
+	}
+
+	/**
+	 * Creates a DatabaseConfigurationFull of the {@link Ipinfo ipinfo}
+	 * {@code DatabaseConfigurationFull} variant.
+	 */
+	public static DatabaseConfigurationFull ipinfo(Function<Ipinfo.Builder, ObjectBuilder<Ipinfo>> fn) {
+		DatabaseConfigurationFull.Builder builder = new DatabaseConfigurationFull.Builder();
+		builder.ipinfo(fn.apply(new Ipinfo.Builder()).build());
+		return builder.build();
+	}
+
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFullVariant.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFullVariant.java
new file mode 100644
index 000000000..01146affb
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationFullVariant.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+/**
+ * Base interface for {@link DatabaseConfigurationFull} variants.
+ */
+public interface DatabaseConfigurationFullVariant {
+
+	DatabaseConfigurationFull.Kind _databaseConfigurationFullKind();
+
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationVariant.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationVariant.java
new file mode 100644
index 000000000..88232446f
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DatabaseConfigurationVariant.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+/**
+ * Base interface for {@link DatabaseConfiguration} variants.
+ */
+public interface DatabaseConfigurationVariant {
+
+	DatabaseConfiguration.Kind _databaseConfigurationKind();
+
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseRequest.java
new file mode 100644
index 000000000..9fbffa205
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseRequest.java
@@ -0,0 +1,289 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.RequestBase;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.json.JsonpDeserializable;
+import co.elastic.clients.json.JsonpDeserializer;
+import co.elastic.clients.json.ObjectBuilderDeserializer;
+import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.transport.Endpoint;
+import co.elastic.clients.transport.endpoints.SimpleEndpoint;
+import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.ObjectBuilder;
+import jakarta.json.stream.JsonGenerator;
+import java.lang.String;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+// typedef: ingest.delete_ip_location_database.Request
+
+/**
+ * Deletes an IP location database configuration.
+ * 
+ * @see <a href=
+ *      "../doc-files/api-spec.html#ingest.delete_ip_location_database.Request">API
+ *      specification</a>
+ */
+
+public class DeleteIpLocationDatabaseRequest extends RequestBase {
+	private final List<String> id;
+
+	@Nullable
+	private final Time masterTimeout;
+
+	@Nullable
+	private final Time timeout;
+
+	// ---------------------------------------------------------------------------------------------
+
+	private DeleteIpLocationDatabaseRequest(Builder builder) {
+
+		this.id = ApiTypeHelper.unmodifiableRequired(builder.id, this, "id");
+		this.masterTimeout = builder.masterTimeout;
+		this.timeout = builder.timeout;
+
+	}
+
+	public static DeleteIpLocationDatabaseRequest of(
+			Function<Builder, ObjectBuilder<DeleteIpLocationDatabaseRequest>> fn) {
+		return fn.apply(new Builder()).build();
+	}
+
+	/**
+	 * Required - A comma-separated list of IP location database configurations to
+	 * delete
+	 * <p>
+	 * API name: {@code id}
+	 */
+	public final List<String> id() {
+		return this.id;
+	}
+
+	/**
+	 * Period to wait for a connection to the master node. If no response is
+	 * received before the timeout expires, the request fails and returns an error.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
+	/**
+	 * Period to wait for a response. If no response is received before the timeout
+	 * expires, the request fails and returns an error.
+	 * <p>
+	 * API name: {@code timeout}
+	 */
+	@Nullable
+	public final Time timeout() {
+		return this.timeout;
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Builder for {@link DeleteIpLocationDatabaseRequest}.
+	 */
+
+	public static class Builder extends RequestBase.AbstractBuilder<Builder>
+			implements
+				ObjectBuilder<DeleteIpLocationDatabaseRequest> {
+		private List<String> id;
+
+		@Nullable
+		private Time masterTimeout;
+
+		@Nullable
+		private Time timeout;
+
+		/**
+		 * Required - A comma-separated list of IP location database configurations to
+		 * delete
+		 * <p>
+		 * API name: {@code id}
+		 * <p>
+		 * Adds all elements of <code>list</code> to <code>id</code>.
+		 */
+		public final Builder id(List<String> list) {
+			this.id = _listAddAll(this.id, list);
+			return this;
+		}
+
+		/**
+		 * Required - A comma-separated list of IP location database configurations to
+		 * delete
+		 * <p>
+		 * API name: {@code id}
+		 * <p>
+		 * Adds one or more values to <code>id</code>.
+		 */
+		public final Builder id(String value, String... values) {
+			this.id = _listAdd(this.id, value, values);
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node. If no response is
+		 * received before the timeout expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node. If no response is
+		 * received before the timeout expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * Period to wait for a response. If no response is received before the timeout
+		 * expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code timeout}
+		 */
+		public final Builder timeout(@Nullable Time value) {
+			this.timeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a response. If no response is received before the timeout
+		 * expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code timeout}
+		 */
+		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.timeout(fn.apply(new Time.Builder()).build());
+		}
+
+		@Override
+		protected Builder self() {
+			return this;
+		}
+
+		/**
+		 * Builds a {@link DeleteIpLocationDatabaseRequest}.
+		 *
+		 * @throws NullPointerException
+		 *             if some of the required fields are null.
+		 */
+		public DeleteIpLocationDatabaseRequest build() {
+			_checkSingleUse();
+
+			return new DeleteIpLocationDatabaseRequest(this);
+		}
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Endpoint "{@code ingest.delete_ip_location_database}".
+	 */
+	public static final Endpoint<DeleteIpLocationDatabaseRequest, DeleteIpLocationDatabaseResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+			"es/ingest.delete_ip_location_database",
+
+			// Request method
+			request -> {
+				return "DELETE";
+
+			},
+
+			// Request path
+			request -> {
+				final int _id = 1 << 0;
+
+				int propsSet = 0;
+
+				propsSet |= _id;
+
+				if (propsSet == (_id)) {
+					StringBuilder buf = new StringBuilder();
+					buf.append("/_ingest");
+					buf.append("/ip_location");
+					buf.append("/database");
+					buf.append("/");
+					SimpleEndpoint.pathEncode(request.id.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+					return buf.toString();
+				}
+				throw SimpleEndpoint.noPathTemplateFound("path");
+
+			},
+
+			// Path parameters
+			request -> {
+				Map<String, String> params = new HashMap<>();
+				final int _id = 1 << 0;
+
+				int propsSet = 0;
+
+				propsSet |= _id;
+
+				if (propsSet == (_id)) {
+					params.put("id", request.id.stream().map(v -> v).collect(Collectors.joining(",")));
+				}
+				return params;
+			},
+
+			// Request parameters
+			request -> {
+				Map<String, String> params = new HashMap<>();
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
+				if (request.timeout != null) {
+					params.put("timeout", request.timeout._toJsonString());
+				}
+				return params;
+
+			}, SimpleEndpoint.emptyMap(), false, DeleteIpLocationDatabaseResponse._DESERIALIZER);
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/FileSettingsIndicator.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseResponse.java
similarity index 51%
rename from java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/FileSettingsIndicator.java
rename to java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseResponse.java
index 2fbfee90c..8c2b16082 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/FileSettingsIndicator.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/DeleteIpLocationDatabaseResponse.java
@@ -17,18 +17,17 @@
  * under the License.
  */
 
-package co.elastic.clients.elasticsearch.core.health_report;
+package co.elastic.clients.elasticsearch.ingest;
 
+import co.elastic.clients.elasticsearch._types.AcknowledgedResponseBase;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
-import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
 import java.util.Objects;
 import java.util.function.Function;
-import javax.annotation.Nullable;
 
 //----------------------------------------------------------------
 //       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
@@ -45,109 +44,66 @@
 //
 //----------------------------------------------------------------
 
-// typedef: _global.health_report.FileSettingsIndicator
+// typedef: ingest.delete_ip_location_database.Response
 
 /**
- * FILE_SETTINGS
- * 
+ *
  * @see <a href=
- *      "../../doc-files/api-spec.html#_global.health_report.FileSettingsIndicator">API
+ *      "../doc-files/api-spec.html#ingest.delete_ip_location_database.Response">API
  *      specification</a>
  */
 @JsonpDeserializable
-public class FileSettingsIndicator extends BaseIndicator {
-	@Nullable
-	private final FileSettingsIndicatorDetails details;
-
+public class DeleteIpLocationDatabaseResponse extends AcknowledgedResponseBase {
 	// ---------------------------------------------------------------------------------------------
 
-	private FileSettingsIndicator(Builder builder) {
+	private DeleteIpLocationDatabaseResponse(Builder builder) {
 		super(builder);
 
-		this.details = builder.details;
-
 	}
 
-	public static FileSettingsIndicator of(Function<Builder, ObjectBuilder<FileSettingsIndicator>> fn) {
+	public static DeleteIpLocationDatabaseResponse of(
+			Function<Builder, ObjectBuilder<DeleteIpLocationDatabaseResponse>> fn) {
 		return fn.apply(new Builder()).build();
 	}
 
-	/**
-	 * API name: {@code details}
-	 */
-	@Nullable
-	public final FileSettingsIndicatorDetails details() {
-		return this.details;
-	}
-
-	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
-
-		super.serializeInternal(generator, mapper);
-		if (this.details != null) {
-			generator.writeKey("details");
-			this.details.serialize(generator, mapper);
-
-		}
-
-	}
-
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Builder for {@link FileSettingsIndicator}.
+	 * Builder for {@link DeleteIpLocationDatabaseResponse}.
 	 */
 
-	public static class Builder extends BaseIndicator.AbstractBuilder<Builder>
+	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
 			implements
-				ObjectBuilder<FileSettingsIndicator> {
-		@Nullable
-		private FileSettingsIndicatorDetails details;
-
-		/**
-		 * API name: {@code details}
-		 */
-		public final Builder details(@Nullable FileSettingsIndicatorDetails value) {
-			this.details = value;
-			return this;
-		}
-
-		/**
-		 * API name: {@code details}
-		 */
-		public final Builder details(
-				Function<FileSettingsIndicatorDetails.Builder, ObjectBuilder<FileSettingsIndicatorDetails>> fn) {
-			return this.details(fn.apply(new FileSettingsIndicatorDetails.Builder()).build());
-		}
-
+				ObjectBuilder<DeleteIpLocationDatabaseResponse> {
 		@Override
 		protected Builder self() {
 			return this;
 		}
 
 		/**
-		 * Builds a {@link FileSettingsIndicator}.
+		 * Builds a {@link DeleteIpLocationDatabaseResponse}.
 		 *
 		 * @throws NullPointerException
 		 *             if some of the required fields are null.
 		 */
-		public FileSettingsIndicator build() {
+		public DeleteIpLocationDatabaseResponse build() {
 			_checkSingleUse();
 
-			return new FileSettingsIndicator(this);
+			return new DeleteIpLocationDatabaseResponse(this);
 		}
 	}
 
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Json deserializer for {@link FileSettingsIndicator}
+	 * Json deserializer for {@link DeleteIpLocationDatabaseResponse}
 	 */
-	public static final JsonpDeserializer<FileSettingsIndicator> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FileSettingsIndicator::setupFileSettingsIndicatorDeserializer);
+	public static final JsonpDeserializer<DeleteIpLocationDatabaseResponse> _DESERIALIZER = ObjectBuilderDeserializer
+			.lazy(Builder::new, DeleteIpLocationDatabaseResponse::setupDeleteIpLocationDatabaseResponseDeserializer);
 
-	protected static void setupFileSettingsIndicatorDeserializer(ObjectDeserializer<FileSettingsIndicator.Builder> op) {
-		BaseIndicator.setupBaseIndicatorDeserializer(op);
-		op.add(Builder::details, FileSettingsIndicatorDetails._DESERIALIZER, "details");
+	protected static void setupDeleteIpLocationDatabaseResponseDeserializer(
+			ObjectDeserializer<DeleteIpLocationDatabaseResponse.Builder> op) {
+		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/ElasticsearchIngestAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/ElasticsearchIngestAsyncClient.java
index c9f5c9469..bb678fb65 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/ElasticsearchIngestAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/ElasticsearchIngestAsyncClient.java
@@ -100,6 +100,40 @@ public final CompletableFuture<DeleteGeoipDatabaseResponse> deleteGeoipDatabase(
 		return deleteGeoipDatabase(fn.apply(new DeleteGeoipDatabaseRequest.Builder()).build());
 	}
 
+	// ----- Endpoint: ingest.delete_ip_location_database
+
+	/**
+	 * Deletes an IP location database configuration.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public CompletableFuture<DeleteIpLocationDatabaseResponse> deleteIpLocationDatabase(
+			DeleteIpLocationDatabaseRequest request) {
+		@SuppressWarnings("unchecked")
+		JsonEndpoint<DeleteIpLocationDatabaseRequest, DeleteIpLocationDatabaseResponse, ErrorResponse> endpoint = (JsonEndpoint<DeleteIpLocationDatabaseRequest, DeleteIpLocationDatabaseResponse, ErrorResponse>) DeleteIpLocationDatabaseRequest._ENDPOINT;
+
+		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+	}
+
+	/**
+	 * Deletes an IP location database configuration.
+	 * 
+	 * @param fn
+	 *            a function that initializes a builder to create the
+	 *            {@link DeleteIpLocationDatabaseRequest}
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public final CompletableFuture<DeleteIpLocationDatabaseResponse> deleteIpLocationDatabase(
+			Function<DeleteIpLocationDatabaseRequest.Builder, ObjectBuilder<DeleteIpLocationDatabaseRequest>> fn) {
+		return deleteIpLocationDatabase(fn.apply(new DeleteIpLocationDatabaseRequest.Builder()).build());
+	}
+
 	// ----- Endpoint: ingest.delete_pipeline
 
 	/**
@@ -197,6 +231,53 @@ public CompletableFuture<GetGeoipDatabaseResponse> getGeoipDatabase() {
 				GetGeoipDatabaseRequest._ENDPOINT, this.transportOptions);
 	}
 
+	// ----- Endpoint: ingest.get_ip_location_database
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public CompletableFuture<GetIpLocationDatabaseResponse> getIpLocationDatabase(
+			GetIpLocationDatabaseRequest request) {
+		@SuppressWarnings("unchecked")
+		JsonEndpoint<GetIpLocationDatabaseRequest, GetIpLocationDatabaseResponse, ErrorResponse> endpoint = (JsonEndpoint<GetIpLocationDatabaseRequest, GetIpLocationDatabaseResponse, ErrorResponse>) GetIpLocationDatabaseRequest._ENDPOINT;
+
+		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+	}
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @param fn
+	 *            a function that initializes a builder to create the
+	 *            {@link GetIpLocationDatabaseRequest}
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public final CompletableFuture<GetIpLocationDatabaseResponse> getIpLocationDatabase(
+			Function<GetIpLocationDatabaseRequest.Builder, ObjectBuilder<GetIpLocationDatabaseRequest>> fn) {
+		return getIpLocationDatabase(fn.apply(new GetIpLocationDatabaseRequest.Builder()).build());
+	}
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public CompletableFuture<GetIpLocationDatabaseResponse> getIpLocationDatabase() {
+		return this.transport.performRequestAsync(new GetIpLocationDatabaseRequest.Builder().build(),
+				GetIpLocationDatabaseRequest._ENDPOINT, this.transportOptions);
+	}
+
 	// ----- Endpoint: ingest.get_pipeline
 
 	/**
@@ -299,6 +380,40 @@ public final CompletableFuture<PutGeoipDatabaseResponse> putGeoipDatabase(
 		return putGeoipDatabase(fn.apply(new PutGeoipDatabaseRequest.Builder()).build());
 	}
 
+	// ----- Endpoint: ingest.put_ip_location_database
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public CompletableFuture<PutIpLocationDatabaseResponse> putIpLocationDatabase(
+			PutIpLocationDatabaseRequest request) {
+		@SuppressWarnings("unchecked")
+		JsonEndpoint<PutIpLocationDatabaseRequest, PutIpLocationDatabaseResponse, ErrorResponse> endpoint = (JsonEndpoint<PutIpLocationDatabaseRequest, PutIpLocationDatabaseResponse, ErrorResponse>) PutIpLocationDatabaseRequest._ENDPOINT;
+
+		return this.transport.performRequestAsync(request, endpoint, this.transportOptions);
+	}
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @param fn
+	 *            a function that initializes a builder to create the
+	 *            {@link PutIpLocationDatabaseRequest}
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public final CompletableFuture<PutIpLocationDatabaseResponse> putIpLocationDatabase(
+			Function<PutIpLocationDatabaseRequest.Builder, ObjectBuilder<PutIpLocationDatabaseRequest>> fn) {
+		return putIpLocationDatabase(fn.apply(new PutIpLocationDatabaseRequest.Builder()).build());
+	}
+
 	// ----- Endpoint: ingest.put_pipeline
 
 	/**
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/ElasticsearchIngestClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/ElasticsearchIngestClient.java
index 3bb097c4f..c4d198a4e 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/ElasticsearchIngestClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/ElasticsearchIngestClient.java
@@ -102,6 +102,41 @@ public final DeleteGeoipDatabaseResponse deleteGeoipDatabase(
 		return deleteGeoipDatabase(fn.apply(new DeleteGeoipDatabaseRequest.Builder()).build());
 	}
 
+	// ----- Endpoint: ingest.delete_ip_location_database
+
+	/**
+	 * Deletes an IP location database configuration.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public DeleteIpLocationDatabaseResponse deleteIpLocationDatabase(DeleteIpLocationDatabaseRequest request)
+			throws IOException, ElasticsearchException {
+		@SuppressWarnings("unchecked")
+		JsonEndpoint<DeleteIpLocationDatabaseRequest, DeleteIpLocationDatabaseResponse, ErrorResponse> endpoint = (JsonEndpoint<DeleteIpLocationDatabaseRequest, DeleteIpLocationDatabaseResponse, ErrorResponse>) DeleteIpLocationDatabaseRequest._ENDPOINT;
+
+		return this.transport.performRequest(request, endpoint, this.transportOptions);
+	}
+
+	/**
+	 * Deletes an IP location database configuration.
+	 * 
+	 * @param fn
+	 *            a function that initializes a builder to create the
+	 *            {@link DeleteIpLocationDatabaseRequest}
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public final DeleteIpLocationDatabaseResponse deleteIpLocationDatabase(
+			Function<DeleteIpLocationDatabaseRequest.Builder, ObjectBuilder<DeleteIpLocationDatabaseRequest>> fn)
+			throws IOException, ElasticsearchException {
+		return deleteIpLocationDatabase(fn.apply(new DeleteIpLocationDatabaseRequest.Builder()).build());
+	}
+
 	// ----- Endpoint: ingest.delete_pipeline
 
 	/**
@@ -203,6 +238,54 @@ public GetGeoipDatabaseResponse getGeoipDatabase() throws IOException, Elasticse
 				GetGeoipDatabaseRequest._ENDPOINT, this.transportOptions);
 	}
 
+	// ----- Endpoint: ingest.get_ip_location_database
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public GetIpLocationDatabaseResponse getIpLocationDatabase(GetIpLocationDatabaseRequest request)
+			throws IOException, ElasticsearchException {
+		@SuppressWarnings("unchecked")
+		JsonEndpoint<GetIpLocationDatabaseRequest, GetIpLocationDatabaseResponse, ErrorResponse> endpoint = (JsonEndpoint<GetIpLocationDatabaseRequest, GetIpLocationDatabaseResponse, ErrorResponse>) GetIpLocationDatabaseRequest._ENDPOINT;
+
+		return this.transport.performRequest(request, endpoint, this.transportOptions);
+	}
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @param fn
+	 *            a function that initializes a builder to create the
+	 *            {@link GetIpLocationDatabaseRequest}
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public final GetIpLocationDatabaseResponse getIpLocationDatabase(
+			Function<GetIpLocationDatabaseRequest.Builder, ObjectBuilder<GetIpLocationDatabaseRequest>> fn)
+			throws IOException, ElasticsearchException {
+		return getIpLocationDatabase(fn.apply(new GetIpLocationDatabaseRequest.Builder()).build());
+	}
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public GetIpLocationDatabaseResponse getIpLocationDatabase() throws IOException, ElasticsearchException {
+		return this.transport.performRequest(new GetIpLocationDatabaseRequest.Builder().build(),
+				GetIpLocationDatabaseRequest._ENDPOINT, this.transportOptions);
+	}
+
 	// ----- Endpoint: ingest.get_pipeline
 
 	/**
@@ -308,6 +391,41 @@ public final PutGeoipDatabaseResponse putGeoipDatabase(
 		return putGeoipDatabase(fn.apply(new PutGeoipDatabaseRequest.Builder()).build());
 	}
 
+	// ----- Endpoint: ingest.put_ip_location_database
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public PutIpLocationDatabaseResponse putIpLocationDatabase(PutIpLocationDatabaseRequest request)
+			throws IOException, ElasticsearchException {
+		@SuppressWarnings("unchecked")
+		JsonEndpoint<PutIpLocationDatabaseRequest, PutIpLocationDatabaseResponse, ErrorResponse> endpoint = (JsonEndpoint<PutIpLocationDatabaseRequest, PutIpLocationDatabaseResponse, ErrorResponse>) PutIpLocationDatabaseRequest._ENDPOINT;
+
+		return this.transport.performRequest(request, endpoint, this.transportOptions);
+	}
+
+	/**
+	 * Returns information about one or more IP location database configurations.
+	 * 
+	 * @param fn
+	 *            a function that initializes a builder to create the
+	 *            {@link PutIpLocationDatabaseRequest}
+	 * @see <a href=
+	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-ip-location-database-api.html">Documentation
+	 *      on elastic.co</a>
+	 */
+
+	public final PutIpLocationDatabaseResponse putIpLocationDatabase(
+			Function<PutIpLocationDatabaseRequest.Builder, ObjectBuilder<PutIpLocationDatabaseRequest>> fn)
+			throws IOException, ElasticsearchException {
+		return putIpLocationDatabase(fn.apply(new PutIpLocationDatabaseRequest.Builder()).build());
+	}
+
 	// ----- Endpoint: ingest.put_pipeline
 
 	/**
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseRequest.java
new file mode 100644
index 000000000..570f1b352
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseRequest.java
@@ -0,0 +1,261 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.RequestBase;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.json.JsonpDeserializable;
+import co.elastic.clients.json.JsonpDeserializer;
+import co.elastic.clients.json.ObjectBuilderDeserializer;
+import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.transport.Endpoint;
+import co.elastic.clients.transport.endpoints.SimpleEndpoint;
+import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.ObjectBuilder;
+import jakarta.json.stream.JsonGenerator;
+import java.lang.String;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+// typedef: ingest.get_ip_location_database.Request
+
+/**
+ * Returns information about one or more IP location database configurations.
+ * 
+ * @see <a href=
+ *      "../doc-files/api-spec.html#ingest.get_ip_location_database.Request">API
+ *      specification</a>
+ */
+
+public class GetIpLocationDatabaseRequest extends RequestBase {
+	private final List<String> id;
+
+	@Nullable
+	private final Time masterTimeout;
+
+	// ---------------------------------------------------------------------------------------------
+
+	private GetIpLocationDatabaseRequest(Builder builder) {
+
+		this.id = ApiTypeHelper.unmodifiable(builder.id);
+		this.masterTimeout = builder.masterTimeout;
+
+	}
+
+	public static GetIpLocationDatabaseRequest of(Function<Builder, ObjectBuilder<GetIpLocationDatabaseRequest>> fn) {
+		return fn.apply(new Builder()).build();
+	}
+
+	/**
+	 * Comma-separated list of database configuration IDs to retrieve. Wildcard
+	 * (<code>*</code>) expressions are supported. To get all database
+	 * configurations, omit this parameter or use <code>*</code>.
+	 * <p>
+	 * API name: {@code id}
+	 */
+	public final List<String> id() {
+		return this.id;
+	}
+
+	/**
+	 * Period to wait for a connection to the master node. If no response is
+	 * received before the timeout expires, the request fails and returns an error.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Builder for {@link GetIpLocationDatabaseRequest}.
+	 */
+
+	public static class Builder extends RequestBase.AbstractBuilder<Builder>
+			implements
+				ObjectBuilder<GetIpLocationDatabaseRequest> {
+		@Nullable
+		private List<String> id;
+
+		@Nullable
+		private Time masterTimeout;
+
+		/**
+		 * Comma-separated list of database configuration IDs to retrieve. Wildcard
+		 * (<code>*</code>) expressions are supported. To get all database
+		 * configurations, omit this parameter or use <code>*</code>.
+		 * <p>
+		 * API name: {@code id}
+		 * <p>
+		 * Adds all elements of <code>list</code> to <code>id</code>.
+		 */
+		public final Builder id(List<String> list) {
+			this.id = _listAddAll(this.id, list);
+			return this;
+		}
+
+		/**
+		 * Comma-separated list of database configuration IDs to retrieve. Wildcard
+		 * (<code>*</code>) expressions are supported. To get all database
+		 * configurations, omit this parameter or use <code>*</code>.
+		 * <p>
+		 * API name: {@code id}
+		 * <p>
+		 * Adds one or more values to <code>id</code>.
+		 */
+		public final Builder id(String value, String... values) {
+			this.id = _listAdd(this.id, value, values);
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node. If no response is
+		 * received before the timeout expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node. If no response is
+		 * received before the timeout expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
+		@Override
+		protected Builder self() {
+			return this;
+		}
+
+		/**
+		 * Builds a {@link GetIpLocationDatabaseRequest}.
+		 *
+		 * @throws NullPointerException
+		 *             if some of the required fields are null.
+		 */
+		public GetIpLocationDatabaseRequest build() {
+			_checkSingleUse();
+
+			return new GetIpLocationDatabaseRequest(this);
+		}
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Endpoint "{@code ingest.get_ip_location_database}".
+	 */
+	public static final Endpoint<GetIpLocationDatabaseRequest, GetIpLocationDatabaseResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+			"es/ingest.get_ip_location_database",
+
+			// Request method
+			request -> {
+				return "GET";
+
+			},
+
+			// Request path
+			request -> {
+				final int _id = 1 << 0;
+
+				int propsSet = 0;
+
+				if (ApiTypeHelper.isDefined(request.id()))
+					propsSet |= _id;
+
+				if (propsSet == 0) {
+					StringBuilder buf = new StringBuilder();
+					buf.append("/_ingest");
+					buf.append("/ip_location");
+					buf.append("/database");
+					return buf.toString();
+				}
+				if (propsSet == (_id)) {
+					StringBuilder buf = new StringBuilder();
+					buf.append("/_ingest");
+					buf.append("/ip_location");
+					buf.append("/database");
+					buf.append("/");
+					SimpleEndpoint.pathEncode(request.id.stream().map(v -> v).collect(Collectors.joining(",")), buf);
+					return buf.toString();
+				}
+				throw SimpleEndpoint.noPathTemplateFound("path");
+
+			},
+
+			// Path parameters
+			request -> {
+				Map<String, String> params = new HashMap<>();
+				final int _id = 1 << 0;
+
+				int propsSet = 0;
+
+				if (ApiTypeHelper.isDefined(request.id()))
+					propsSet |= _id;
+
+				if (propsSet == 0) {
+				}
+				if (propsSet == (_id)) {
+					params.put("id", request.id.stream().map(v -> v).collect(Collectors.joining(",")));
+				}
+				return params;
+			},
+
+			// Request parameters
+			request -> {
+				Map<String, String> params = new HashMap<>();
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
+				return params;
+
+			}, SimpleEndpoint.emptyMap(), false, GetIpLocationDatabaseResponse._DESERIALIZER);
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/FileSettingsIndicatorDetails.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseResponse.java
similarity index 53%
rename from java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/FileSettingsIndicatorDetails.java
rename to java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseResponse.java
index dd7f978ba..ccc8d9f58 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/health_report/FileSettingsIndicatorDetails.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/GetIpLocationDatabaseResponse.java
@@ -17,8 +17,9 @@
  * under the License.
  */
 
-package co.elastic.clients.elasticsearch.core.health_report;
+package co.elastic.clients.elasticsearch.ingest;
 
+import co.elastic.clients.elasticsearch.ingest.get_ip_location_database.DatabaseConfigurationMetadata;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
@@ -30,8 +31,7 @@
 import co.elastic.clients.util.ObjectBuilder;
 import co.elastic.clients.util.WithJsonObjectBuilderBase;
 import jakarta.json.stream.JsonGenerator;
-import java.lang.Long;
-import java.lang.String;
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Nullable;
@@ -51,45 +51,35 @@
 //
 //----------------------------------------------------------------
 
-// typedef: _global.health_report.FileSettingsIndicatorDetails
+// typedef: ingest.get_ip_location_database.Response
 
 /**
  *
  * @see <a href=
- *      "../../doc-files/api-spec.html#_global.health_report.FileSettingsIndicatorDetails">API
+ *      "../doc-files/api-spec.html#ingest.get_ip_location_database.Response">API
  *      specification</a>
  */
 @JsonpDeserializable
-public class FileSettingsIndicatorDetails implements JsonpSerializable {
-	private final long failureStreak;
-
-	private final String mostRecentFailure;
+public class GetIpLocationDatabaseResponse implements JsonpSerializable {
+	private final List<DatabaseConfigurationMetadata> databases;
 
 	// ---------------------------------------------------------------------------------------------
 
-	private FileSettingsIndicatorDetails(Builder builder) {
+	private GetIpLocationDatabaseResponse(Builder builder) {
 
-		this.failureStreak = ApiTypeHelper.requireNonNull(builder.failureStreak, this, "failureStreak");
-		this.mostRecentFailure = ApiTypeHelper.requireNonNull(builder.mostRecentFailure, this, "mostRecentFailure");
+		this.databases = ApiTypeHelper.unmodifiableRequired(builder.databases, this, "databases");
 
 	}
 
-	public static FileSettingsIndicatorDetails of(Function<Builder, ObjectBuilder<FileSettingsIndicatorDetails>> fn) {
+	public static GetIpLocationDatabaseResponse of(Function<Builder, ObjectBuilder<GetIpLocationDatabaseResponse>> fn) {
 		return fn.apply(new Builder()).build();
 	}
 
 	/**
-	 * Required - API name: {@code failure_streak}
-	 */
-	public final long failureStreak() {
-		return this.failureStreak;
-	}
-
-	/**
-	 * Required - API name: {@code most_recent_failure}
+	 * Required - API name: {@code databases}
 	 */
-	public final String mostRecentFailure() {
-		return this.mostRecentFailure;
+	public final List<DatabaseConfigurationMetadata> databases() {
+		return this.databases;
 	}
 
 	/**
@@ -103,11 +93,16 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("failure_streak");
-		generator.write(this.failureStreak);
+		if (ApiTypeHelper.isDefined(this.databases)) {
+			generator.writeKey("databases");
+			generator.writeStartArray();
+			for (DatabaseConfigurationMetadata item0 : this.databases) {
+				item0.serialize(generator, mapper);
+
+			}
+			generator.writeEnd();
 
-		generator.writeKey("most_recent_failure");
-		generator.write(this.mostRecentFailure);
+		}
 
 	}
 
@@ -119,63 +114,75 @@ public String toString() {
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Builder for {@link FileSettingsIndicatorDetails}.
+	 * Builder for {@link GetIpLocationDatabaseResponse}.
 	 */
 
 	public static class Builder extends WithJsonObjectBuilderBase<Builder>
 			implements
-				ObjectBuilder<FileSettingsIndicatorDetails> {
-		private Long failureStreak;
-
-		private String mostRecentFailure;
+				ObjectBuilder<GetIpLocationDatabaseResponse> {
+		private List<DatabaseConfigurationMetadata> databases;
 
 		/**
-		 * Required - API name: {@code failure_streak}
+		 * Required - API name: {@code databases}
+		 * <p>
+		 * Adds all elements of <code>list</code> to <code>databases</code>.
 		 */
-		public final Builder failureStreak(long value) {
-			this.failureStreak = value;
+		public final Builder databases(List<DatabaseConfigurationMetadata> list) {
+			this.databases = _listAddAll(this.databases, list);
 			return this;
 		}
 
 		/**
-		 * Required - API name: {@code most_recent_failure}
+		 * Required - API name: {@code databases}
+		 * <p>
+		 * Adds one or more values to <code>databases</code>.
 		 */
-		public final Builder mostRecentFailure(String value) {
-			this.mostRecentFailure = value;
+		public final Builder databases(DatabaseConfigurationMetadata value, DatabaseConfigurationMetadata... values) {
+			this.databases = _listAdd(this.databases, value, values);
 			return this;
 		}
 
+		/**
+		 * Required - API name: {@code databases}
+		 * <p>
+		 * Adds a value to <code>databases</code> using a builder lambda.
+		 */
+		public final Builder databases(
+				Function<DatabaseConfigurationMetadata.Builder, ObjectBuilder<DatabaseConfigurationMetadata>> fn) {
+			return databases(fn.apply(new DatabaseConfigurationMetadata.Builder()).build());
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
 		}
 
 		/**
-		 * Builds a {@link FileSettingsIndicatorDetails}.
+		 * Builds a {@link GetIpLocationDatabaseResponse}.
 		 *
 		 * @throws NullPointerException
 		 *             if some of the required fields are null.
 		 */
-		public FileSettingsIndicatorDetails build() {
+		public GetIpLocationDatabaseResponse build() {
 			_checkSingleUse();
 
-			return new FileSettingsIndicatorDetails(this);
+			return new GetIpLocationDatabaseResponse(this);
 		}
 	}
 
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Json deserializer for {@link FileSettingsIndicatorDetails}
+	 * Json deserializer for {@link GetIpLocationDatabaseResponse}
 	 */
-	public static final JsonpDeserializer<FileSettingsIndicatorDetails> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, FileSettingsIndicatorDetails::setupFileSettingsIndicatorDetailsDeserializer);
+	public static final JsonpDeserializer<GetIpLocationDatabaseResponse> _DESERIALIZER = ObjectBuilderDeserializer
+			.lazy(Builder::new, GetIpLocationDatabaseResponse::setupGetIpLocationDatabaseResponseDeserializer);
 
-	protected static void setupFileSettingsIndicatorDetailsDeserializer(
-			ObjectDeserializer<FileSettingsIndicatorDetails.Builder> op) {
+	protected static void setupGetIpLocationDatabaseResponseDeserializer(
+			ObjectDeserializer<GetIpLocationDatabaseResponse.Builder> op) {
 
-		op.add(Builder::failureStreak, JsonpDeserializer.longDeserializer(), "failure_streak");
-		op.add(Builder::mostRecentFailure, JsonpDeserializer.stringDeserializer(), "most_recent_failure");
+		op.add(Builder::databases, JsonpDeserializer.arrayDeserializer(DatabaseConfigurationMetadata._DESERIALIZER),
+				"databases");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Ipinfo.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Ipinfo.java
new file mode 100644
index 000000000..85c4569c9
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Ipinfo.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+import co.elastic.clients.json.JsonpDeserializable;
+import co.elastic.clients.json.JsonpDeserializer;
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.util.ObjectBuilder;
+import jakarta.json.stream.JsonGenerator;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+/**
+ *
+ * @see <a href="../doc-files/api-spec.html#ingest._types.Ipinfo">API
+ *      specification</a>
+ */
+@JsonpDeserializable
+public class Ipinfo implements DatabaseConfigurationFullVariant, DatabaseConfigurationVariant, JsonpSerializable {
+
+	/**
+	 * DatabaseConfigurationFull variant kind.
+	 */
+	@Override
+	public DatabaseConfigurationFull.Kind _databaseConfigurationFullKind() {
+		return DatabaseConfigurationFull.Kind.Ipinfo;
+	}
+
+	/**
+	 * DatabaseConfiguration variant kind.
+	 */
+	@Override
+	public DatabaseConfiguration.Kind _databaseConfigurationKind() {
+		return DatabaseConfiguration.Kind.Ipinfo;
+	}
+
+	public static final class Builder implements ObjectBuilder<Ipinfo> {
+		@Override
+		public Ipinfo build() {
+			return Ipinfo._INSTANCE;
+		}
+	}
+
+	/**
+	 * Serialize this object to JSON.
+	 */
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+		generator.writeStartObject();
+		generator.writeEnd();
+	}
+
+	/**
+	 * Singleton instance for empty class {@link Ipinfo}.
+	 */
+	public static final Ipinfo _INSTANCE = new Ipinfo();
+
+	public static final JsonpDeserializer<Ipinfo> _DESERIALIZER = JsonpDeserializer.emptyObject(Ipinfo._INSTANCE);
+
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/help/HelpRecord.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Local.java
similarity index 69%
rename from java-client/src/main/java/co/elastic/clients/elasticsearch/cat/help/HelpRecord.java
rename to java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Local.java
index 5c193bb45..1f2cf6f1b 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cat/help/HelpRecord.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Local.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package co.elastic.clients.elasticsearch.cat.help;
+package co.elastic.clients.elasticsearch.ingest;
 
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
@@ -50,34 +50,42 @@
 //
 //----------------------------------------------------------------
 
-// typedef: cat.help.HelpRecord
+// typedef: ingest._types.Local
 
 /**
  *
- * @see <a href="../../doc-files/api-spec.html#cat.help.HelpRecord">API
+ * @see <a href="../doc-files/api-spec.html#ingest._types.Local">API
  *      specification</a>
  */
 @JsonpDeserializable
-public class HelpRecord implements JsonpSerializable {
-	private final String endpoint;
+public class Local implements DatabaseConfigurationFullVariant, JsonpSerializable {
+	private final String type;
 
 	// ---------------------------------------------------------------------------------------------
 
-	private HelpRecord(Builder builder) {
+	private Local(Builder builder) {
 
-		this.endpoint = ApiTypeHelper.requireNonNull(builder.endpoint, this, "endpoint");
+		this.type = ApiTypeHelper.requireNonNull(builder.type, this, "type");
 
 	}
 
-	public static HelpRecord of(Function<Builder, ObjectBuilder<HelpRecord>> fn) {
+	public static Local of(Function<Builder, ObjectBuilder<Local>> fn) {
 		return fn.apply(new Builder()).build();
 	}
 
 	/**
-	 * Required - API name: {@code endpoint}
+	 * DatabaseConfigurationFull variant kind.
 	 */
-	public final String endpoint() {
-		return this.endpoint;
+	@Override
+	public DatabaseConfigurationFull.Kind _databaseConfigurationFullKind() {
+		return DatabaseConfigurationFull.Kind.Local;
+	}
+
+	/**
+	 * Required - API name: {@code type}
+	 */
+	public final String type() {
+		return this.type;
 	}
 
 	/**
@@ -91,8 +99,8 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		generator.writeKey("endpoint");
-		generator.write(this.endpoint);
+		generator.writeKey("type");
+		generator.write(this.type);
 
 	}
 
@@ -104,17 +112,17 @@ public String toString() {
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Builder for {@link HelpRecord}.
+	 * Builder for {@link Local}.
 	 */
 
-	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<HelpRecord> {
-		private String endpoint;
+	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<Local> {
+		private String type;
 
 		/**
-		 * Required - API name: {@code endpoint}
+		 * Required - API name: {@code type}
 		 */
-		public final Builder endpoint(String value) {
-			this.endpoint = value;
+		public final Builder type(String value) {
+			this.type = value;
 			return this;
 		}
 
@@ -124,29 +132,29 @@ protected Builder self() {
 		}
 
 		/**
-		 * Builds a {@link HelpRecord}.
+		 * Builds a {@link Local}.
 		 *
 		 * @throws NullPointerException
 		 *             if some of the required fields are null.
 		 */
-		public HelpRecord build() {
+		public Local build() {
 			_checkSingleUse();
 
-			return new HelpRecord(this);
+			return new Local(this);
 		}
 	}
 
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Json deserializer for {@link HelpRecord}
+	 * Json deserializer for {@link Local}
 	 */
-	public static final JsonpDeserializer<HelpRecord> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
-			HelpRecord::setupHelpRecordDeserializer);
+	public static final JsonpDeserializer<Local> _DESERIALIZER = ObjectBuilderDeserializer.lazy(Builder::new,
+			Local::setupLocalDeserializer);
 
-	protected static void setupHelpRecordDeserializer(ObjectDeserializer<HelpRecord.Builder> op) {
+	protected static void setupLocalDeserializer(ObjectDeserializer<Local.Builder> op) {
 
-		op.add(Builder::endpoint, JsonpDeserializer.stringDeserializer(), "endpoint");
+		op.add(Builder::type, JsonpDeserializer.stringDeserializer(), "type");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Maxmind.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Maxmind.java
index 702572886..ac93cf0c4 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Maxmind.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Maxmind.java
@@ -58,7 +58,7 @@
  *      specification</a>
  */
 @JsonpDeserializable
-public class Maxmind implements JsonpSerializable {
+public class Maxmind implements DatabaseConfigurationFullVariant, DatabaseConfigurationVariant, JsonpSerializable {
 	private final String accountId;
 
 	// ---------------------------------------------------------------------------------------------
@@ -73,6 +73,22 @@ public static Maxmind of(Function<Builder, ObjectBuilder<Maxmind>> fn) {
 		return fn.apply(new Builder()).build();
 	}
 
+	/**
+	 * DatabaseConfigurationFull variant kind.
+	 */
+	@Override
+	public DatabaseConfigurationFull.Kind _databaseConfigurationFullKind() {
+		return DatabaseConfigurationFull.Kind.Maxmind;
+	}
+
+	/**
+	 * DatabaseConfiguration variant kind.
+	 */
+	@Override
+	public DatabaseConfiguration.Kind _databaseConfigurationKind() {
+		return DatabaseConfiguration.Kind.Maxmind;
+	}
+
 	/**
 	 * Required - API name: {@code account_id}
 	 */
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/PutIpLocationDatabaseRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/PutIpLocationDatabaseRequest.java
new file mode 100644
index 000000000..141b98cd9
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/PutIpLocationDatabaseRequest.java
@@ -0,0 +1,326 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+import co.elastic.clients.elasticsearch._types.ErrorResponse;
+import co.elastic.clients.elasticsearch._types.RequestBase;
+import co.elastic.clients.elasticsearch._types.Time;
+import co.elastic.clients.json.JsonpDeserializable;
+import co.elastic.clients.json.JsonpDeserializer;
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.ObjectBuilderDeserializer;
+import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.transport.Endpoint;
+import co.elastic.clients.transport.endpoints.SimpleEndpoint;
+import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.ObjectBuilder;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonParser;
+import java.lang.String;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+// typedef: ingest.put_ip_location_database.Request
+
+/**
+ * Returns information about one or more IP location database configurations.
+ * 
+ * @see <a href=
+ *      "../doc-files/api-spec.html#ingest.put_ip_location_database.Request">API
+ *      specification</a>
+ */
+@JsonpDeserializable
+public class PutIpLocationDatabaseRequest extends RequestBase implements JsonpSerializable {
+	private final String id;
+
+	@Nullable
+	private final Time masterTimeout;
+
+	@Nullable
+	private final Time timeout;
+
+	private final DatabaseConfiguration configuration;
+
+	// ---------------------------------------------------------------------------------------------
+
+	private PutIpLocationDatabaseRequest(Builder builder) {
+
+		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+		this.masterTimeout = builder.masterTimeout;
+		this.timeout = builder.timeout;
+		this.configuration = ApiTypeHelper.requireNonNull(builder.configuration, this, "configuration");
+
+	}
+
+	public static PutIpLocationDatabaseRequest of(Function<Builder, ObjectBuilder<PutIpLocationDatabaseRequest>> fn) {
+		return fn.apply(new Builder()).build();
+	}
+
+	/**
+	 * Required - ID of the database configuration to create or update.
+	 * <p>
+	 * API name: {@code id}
+	 */
+	public final String id() {
+		return this.id;
+	}
+
+	/**
+	 * Period to wait for a connection to the master node. If no response is
+	 * received before the timeout expires, the request fails and returns an error.
+	 * <p>
+	 * API name: {@code master_timeout}
+	 */
+	@Nullable
+	public final Time masterTimeout() {
+		return this.masterTimeout;
+	}
+
+	/**
+	 * Period to wait for a response. If no response is received before the timeout
+	 * expires, the request fails and returns an error.
+	 * <p>
+	 * API name: {@code timeout}
+	 */
+	@Nullable
+	public final Time timeout() {
+		return this.timeout;
+	}
+
+	/**
+	 * Required - Request body.
+	 */
+	public final DatabaseConfiguration configuration() {
+		return this.configuration;
+	}
+
+	/**
+	 * Serialize this value to JSON.
+	 */
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+		this.configuration.serialize(generator, mapper);
+
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Builder for {@link PutIpLocationDatabaseRequest}.
+	 */
+
+	public static class Builder extends RequestBase.AbstractBuilder<Builder>
+			implements
+				ObjectBuilder<PutIpLocationDatabaseRequest> {
+		private String id;
+
+		@Nullable
+		private Time masterTimeout;
+
+		@Nullable
+		private Time timeout;
+
+		private DatabaseConfiguration configuration;
+
+		/**
+		 * Required - ID of the database configuration to create or update.
+		 * <p>
+		 * API name: {@code id}
+		 */
+		public final Builder id(String value) {
+			this.id = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node. If no response is
+		 * received before the timeout expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(@Nullable Time value) {
+			this.masterTimeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a connection to the master node. If no response is
+		 * received before the timeout expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code master_timeout}
+		 */
+		public final Builder masterTimeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.masterTimeout(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * Period to wait for a response. If no response is received before the timeout
+		 * expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code timeout}
+		 */
+		public final Builder timeout(@Nullable Time value) {
+			this.timeout = value;
+			return this;
+		}
+
+		/**
+		 * Period to wait for a response. If no response is received before the timeout
+		 * expires, the request fails and returns an error.
+		 * <p>
+		 * API name: {@code timeout}
+		 */
+		public final Builder timeout(Function<Time.Builder, ObjectBuilder<Time>> fn) {
+			return this.timeout(fn.apply(new Time.Builder()).build());
+		}
+
+		/**
+		 * Required - Request body.
+		 */
+		public final Builder configuration(DatabaseConfiguration value) {
+			this.configuration = value;
+			return this;
+		}
+
+		/**
+		 * Required - Request body.
+		 */
+		public final Builder configuration(
+				Function<DatabaseConfiguration.Builder, ObjectBuilder<DatabaseConfiguration>> fn) {
+			return this.configuration(fn.apply(new DatabaseConfiguration.Builder()).build());
+		}
+
+		@Override
+		public Builder withJson(JsonParser parser, JsonpMapper mapper) {
+
+			@SuppressWarnings("unchecked")
+			DatabaseConfiguration value = (DatabaseConfiguration) DatabaseConfiguration._DESERIALIZER
+					.deserialize(parser, mapper);
+			return this.configuration(value);
+		}
+
+		@Override
+		protected Builder self() {
+			return this;
+		}
+
+		/**
+		 * Builds a {@link PutIpLocationDatabaseRequest}.
+		 *
+		 * @throws NullPointerException
+		 *             if some of the required fields are null.
+		 */
+		public PutIpLocationDatabaseRequest build() {
+			_checkSingleUse();
+
+			return new PutIpLocationDatabaseRequest(this);
+		}
+	}
+
+	public static final JsonpDeserializer<PutIpLocationDatabaseRequest> _DESERIALIZER = createPutIpLocationDatabaseRequestDeserializer();
+	protected static JsonpDeserializer<PutIpLocationDatabaseRequest> createPutIpLocationDatabaseRequestDeserializer() {
+
+		JsonpDeserializer<DatabaseConfiguration> valueDeserializer = DatabaseConfiguration._DESERIALIZER;
+
+		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper, event) -> new Builder()
+				.configuration(valueDeserializer.deserialize(parser, mapper, event)).build());
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Endpoint "{@code ingest.put_ip_location_database}".
+	 */
+	public static final Endpoint<PutIpLocationDatabaseRequest, PutIpLocationDatabaseResponse, ErrorResponse> _ENDPOINT = new SimpleEndpoint<>(
+			"es/ingest.put_ip_location_database",
+
+			// Request method
+			request -> {
+				return "PUT";
+
+			},
+
+			// Request path
+			request -> {
+				final int _id = 1 << 0;
+
+				int propsSet = 0;
+
+				propsSet |= _id;
+
+				if (propsSet == (_id)) {
+					StringBuilder buf = new StringBuilder();
+					buf.append("/_ingest");
+					buf.append("/ip_location");
+					buf.append("/database");
+					buf.append("/");
+					SimpleEndpoint.pathEncode(request.id, buf);
+					return buf.toString();
+				}
+				throw SimpleEndpoint.noPathTemplateFound("path");
+
+			},
+
+			// Path parameters
+			request -> {
+				Map<String, String> params = new HashMap<>();
+				final int _id = 1 << 0;
+
+				int propsSet = 0;
+
+				propsSet |= _id;
+
+				if (propsSet == (_id)) {
+					params.put("id", request.id);
+				}
+				return params;
+			},
+
+			// Request parameters
+			request -> {
+				Map<String, String> params = new HashMap<>();
+				if (request.masterTimeout != null) {
+					params.put("master_timeout", request.masterTimeout._toJsonString());
+				}
+				if (request.timeout != null) {
+					params.put("timeout", request.timeout._toJsonString());
+				}
+				return params;
+
+			}, SimpleEndpoint.emptyMap(), true, PutIpLocationDatabaseResponse._DESERIALIZER);
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/PutIpLocationDatabaseResponse.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/PutIpLocationDatabaseResponse.java
new file mode 100644
index 000000000..b679ae5a2
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/PutIpLocationDatabaseResponse.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest;
+
+import co.elastic.clients.elasticsearch._types.AcknowledgedResponseBase;
+import co.elastic.clients.json.JsonpDeserializable;
+import co.elastic.clients.json.JsonpDeserializer;
+import co.elastic.clients.json.ObjectBuilderDeserializer;
+import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.util.ObjectBuilder;
+import jakarta.json.stream.JsonGenerator;
+import java.util.Objects;
+import java.util.function.Function;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+// typedef: ingest.put_ip_location_database.Response
+
+/**
+ *
+ * @see <a href=
+ *      "../doc-files/api-spec.html#ingest.put_ip_location_database.Response">API
+ *      specification</a>
+ */
+@JsonpDeserializable
+public class PutIpLocationDatabaseResponse extends AcknowledgedResponseBase {
+	// ---------------------------------------------------------------------------------------------
+
+	private PutIpLocationDatabaseResponse(Builder builder) {
+		super(builder);
+
+	}
+
+	public static PutIpLocationDatabaseResponse of(Function<Builder, ObjectBuilder<PutIpLocationDatabaseResponse>> fn) {
+		return fn.apply(new Builder()).build();
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Builder for {@link PutIpLocationDatabaseResponse}.
+	 */
+
+	public static class Builder extends AcknowledgedResponseBase.AbstractBuilder<Builder>
+			implements
+				ObjectBuilder<PutIpLocationDatabaseResponse> {
+		@Override
+		protected Builder self() {
+			return this;
+		}
+
+		/**
+		 * Builds a {@link PutIpLocationDatabaseResponse}.
+		 *
+		 * @throws NullPointerException
+		 *             if some of the required fields are null.
+		 */
+		public PutIpLocationDatabaseResponse build() {
+			_checkSingleUse();
+
+			return new PutIpLocationDatabaseResponse(this);
+		}
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Json deserializer for {@link PutIpLocationDatabaseResponse}
+	 */
+	public static final JsonpDeserializer<PutIpLocationDatabaseResponse> _DESERIALIZER = ObjectBuilderDeserializer
+			.lazy(Builder::new, PutIpLocationDatabaseResponse::setupPutIpLocationDatabaseResponseDeserializer);
+
+	protected static void setupPutIpLocationDatabaseResponseDeserializer(
+			ObjectDeserializer<PutIpLocationDatabaseResponse.Builder> op) {
+		AcknowledgedResponseBase.setupAcknowledgedResponseBaseDeserializer(op);
+
+	}
+
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorElementType.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Web.java
similarity index 60%
rename from java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorElementType.java
rename to java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Web.java
index 15678bbd4..9e5a42ebe 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/DenseVectorElementType.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Web.java
@@ -17,11 +17,14 @@
  * under the License.
  */
 
-package co.elastic.clients.elasticsearch._types.mapping;
+package co.elastic.clients.elasticsearch.ingest;
 
-import co.elastic.clients.json.JsonEnum;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.util.ObjectBuilder;
+import jakarta.json.stream.JsonGenerator;
 
 //----------------------------------------------------------------
 //       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
@@ -40,43 +43,40 @@
 
 /**
  *
- * @see <a href=
- *      "../../doc-files/api-spec.html#_types.mapping.DenseVectorElementType">API
+ * @see <a href="../doc-files/api-spec.html#ingest._types.Web">API
  *      specification</a>
  */
 @JsonpDeserializable
-public enum DenseVectorElementType implements JsonEnum {
+public class Web implements DatabaseConfigurationFullVariant, JsonpSerializable {
+
 	/**
-	 * Indexes a single bit per dimension. Useful for very high-dimensional vectors
-	 * or models that specifically support bit vectors.
-	 * <p>
-	 * NOTE: when using <code>bit</code>, the number of dimensions must be a
-	 * multiple of <code>8</code> and must represent the number of bits.
+	 * DatabaseConfigurationFull variant kind.
 	 */
-	Bit("bit"),
+	@Override
+	public DatabaseConfigurationFull.Kind _databaseConfigurationFullKind() {
+		return DatabaseConfigurationFull.Kind.Web;
+	}
+
+	public static final class Builder implements ObjectBuilder<Web> {
+		@Override
+		public Web build() {
+			return Web._INSTANCE;
+		}
+	}
 
 	/**
-	 * Indexes a 1-byte integer value per dimension.
+	 * Serialize this object to JSON.
 	 */
-	Byte("byte"),
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+		generator.writeStartObject();
+		generator.writeEnd();
+	}
 
 	/**
-	 * Indexes a 4-byte floating-point value per dimension.
+	 * Singleton instance for empty class {@link Web}.
 	 */
-	Float("float"),
+	public static final Web _INSTANCE = new Web();
 
-	;
-
-	private final String jsonValue;
-
-	DenseVectorElementType(String jsonValue) {
-		this.jsonValue = jsonValue;
-	}
-
-	public String jsonValue() {
-		return this.jsonValue;
-	}
+	public static final JsonpDeserializer<Web> _DESERIALIZER = JsonpDeserializer.emptyObject(Web._INSTANCE);
 
-	public static final JsonEnum.Deserializer<DenseVectorElementType> _DESERIALIZER = new JsonEnum.Deserializer<>(
-			DenseVectorElementType.values());
 }
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/get_ip_location_database/DatabaseConfigurationMetadata.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/get_ip_location_database/DatabaseConfigurationMetadata.java
new file mode 100644
index 000000000..4dc9b6398
--- /dev/null
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/get_ip_location_database/DatabaseConfigurationMetadata.java
@@ -0,0 +1,273 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package co.elastic.clients.elasticsearch.ingest.get_ip_location_database;
+
+import co.elastic.clients.elasticsearch.ingest.DatabaseConfigurationFull;
+import co.elastic.clients.json.JsonpDeserializable;
+import co.elastic.clients.json.JsonpDeserializer;
+import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
+import co.elastic.clients.json.ObjectBuilderDeserializer;
+import co.elastic.clients.json.ObjectDeserializer;
+import co.elastic.clients.util.ApiTypeHelper;
+import co.elastic.clients.util.ObjectBuilder;
+import co.elastic.clients.util.WithJsonObjectBuilderBase;
+import jakarta.json.stream.JsonGenerator;
+import java.lang.Long;
+import java.lang.String;
+import java.util.Objects;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+
+//----------------------------------------------------------------
+//       THIS CODE IS GENERATED. MANUAL EDITS WILL BE LOST.
+//----------------------------------------------------------------
+//
+// This code is generated from the Elasticsearch API specification
+// at https://github.com/elastic/elasticsearch-specification
+//
+// Manual updates to this file will be lost when the code is
+// re-generated.
+//
+// If you find a property that is missing or wrongly typed, please
+// open an issue or a PR on the API specification repository.
+//
+//----------------------------------------------------------------
+
+// typedef: ingest.get_ip_location_database.DatabaseConfigurationMetadata
+
+/**
+ *
+ * @see <a href=
+ *      "../../doc-files/api-spec.html#ingest.get_ip_location_database.DatabaseConfigurationMetadata">API
+ *      specification</a>
+ */
+@JsonpDeserializable
+public class DatabaseConfigurationMetadata implements JsonpSerializable {
+	private final String id;
+
+	private final long version;
+
+	@Nullable
+	private final Long modifiedDateMillis;
+
+	@Nullable
+	private final Long modifiedDate;
+
+	private final DatabaseConfigurationFull database;
+
+	// ---------------------------------------------------------------------------------------------
+
+	private DatabaseConfigurationMetadata(Builder builder) {
+
+		this.id = ApiTypeHelper.requireNonNull(builder.id, this, "id");
+		this.version = ApiTypeHelper.requireNonNull(builder.version, this, "version");
+		this.modifiedDateMillis = builder.modifiedDateMillis;
+		this.modifiedDate = builder.modifiedDate;
+		this.database = ApiTypeHelper.requireNonNull(builder.database, this, "database");
+
+	}
+
+	public static DatabaseConfigurationMetadata of(Function<Builder, ObjectBuilder<DatabaseConfigurationMetadata>> fn) {
+		return fn.apply(new Builder()).build();
+	}
+
+	/**
+	 * Required - API name: {@code id}
+	 */
+	public final String id() {
+		return this.id;
+	}
+
+	/**
+	 * Required - API name: {@code version}
+	 */
+	public final long version() {
+		return this.version;
+	}
+
+	/**
+	 * API name: {@code modified_date_millis}
+	 */
+	@Nullable
+	public final Long modifiedDateMillis() {
+		return this.modifiedDateMillis;
+	}
+
+	/**
+	 * API name: {@code modified_date}
+	 */
+	@Nullable
+	public final Long modifiedDate() {
+		return this.modifiedDate;
+	}
+
+	/**
+	 * Required - API name: {@code database}
+	 */
+	public final DatabaseConfigurationFull database() {
+		return this.database;
+	}
+
+	/**
+	 * Serialize this object to JSON.
+	 */
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+		generator.writeStartObject();
+		serializeInternal(generator, mapper);
+		generator.writeEnd();
+	}
+
+	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
+
+		generator.writeKey("id");
+		generator.write(this.id);
+
+		generator.writeKey("version");
+		generator.write(this.version);
+
+		if (this.modifiedDateMillis != null) {
+			generator.writeKey("modified_date_millis");
+			generator.write(this.modifiedDateMillis);
+
+		}
+		if (this.modifiedDate != null) {
+			generator.writeKey("modified_date");
+			generator.write(this.modifiedDate);
+
+		}
+		generator.writeKey("database");
+		this.database.serialize(generator, mapper);
+
+	}
+
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Builder for {@link DatabaseConfigurationMetadata}.
+	 */
+
+	public static class Builder extends WithJsonObjectBuilderBase<Builder>
+			implements
+				ObjectBuilder<DatabaseConfigurationMetadata> {
+		private String id;
+
+		private Long version;
+
+		@Nullable
+		private Long modifiedDateMillis;
+
+		@Nullable
+		private Long modifiedDate;
+
+		private DatabaseConfigurationFull database;
+
+		/**
+		 * Required - API name: {@code id}
+		 */
+		public final Builder id(String value) {
+			this.id = value;
+			return this;
+		}
+
+		/**
+		 * Required - API name: {@code version}
+		 */
+		public final Builder version(long value) {
+			this.version = value;
+			return this;
+		}
+
+		/**
+		 * API name: {@code modified_date_millis}
+		 */
+		public final Builder modifiedDateMillis(@Nullable Long value) {
+			this.modifiedDateMillis = value;
+			return this;
+		}
+
+		/**
+		 * API name: {@code modified_date}
+		 */
+		public final Builder modifiedDate(@Nullable Long value) {
+			this.modifiedDate = value;
+			return this;
+		}
+
+		/**
+		 * Required - API name: {@code database}
+		 */
+		public final Builder database(DatabaseConfigurationFull value) {
+			this.database = value;
+			return this;
+		}
+
+		/**
+		 * Required - API name: {@code database}
+		 */
+		public final Builder database(
+				Function<DatabaseConfigurationFull.Builder, ObjectBuilder<DatabaseConfigurationFull>> fn) {
+			return this.database(fn.apply(new DatabaseConfigurationFull.Builder()).build());
+		}
+
+		@Override
+		protected Builder self() {
+			return this;
+		}
+
+		/**
+		 * Builds a {@link DatabaseConfigurationMetadata}.
+		 *
+		 * @throws NullPointerException
+		 *             if some of the required fields are null.
+		 */
+		public DatabaseConfigurationMetadata build() {
+			_checkSingleUse();
+
+			return new DatabaseConfigurationMetadata(this);
+		}
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
+	/**
+	 * Json deserializer for {@link DatabaseConfigurationMetadata}
+	 */
+	public static final JsonpDeserializer<DatabaseConfigurationMetadata> _DESERIALIZER = ObjectBuilderDeserializer
+			.lazy(Builder::new, DatabaseConfigurationMetadata::setupDatabaseConfigurationMetadataDeserializer);
+
+	protected static void setupDatabaseConfigurationMetadataDeserializer(
+			ObjectDeserializer<DatabaseConfigurationMetadata.Builder> op) {
+
+		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
+		op.add(Builder::version, JsonpDeserializer.longDeserializer(), "version");
+		op.add(Builder::modifiedDateMillis, JsonpDeserializer.longDeserializer(), "modified_date_millis");
+		op.add(Builder::modifiedDate, JsonpDeserializer.longDeserializer(), "modified_date");
+		op.add(Builder::database, DatabaseConfigurationFull._DESERIALIZER, "database");
+
+	}
+
+}
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/DeletePipelineRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/DeletePipelineRequest.java
index ae6b4a3c0..ffa231af7 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/DeletePipelineRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/DeletePipelineRequest.java
@@ -58,9 +58,7 @@
 // typedef: logstash.delete_pipeline.Request
 
 /**
- * Delete a Logstash pipeline.
- * <p>
- * Delete a pipeline that is used for Logstash Central Management.
+ * Deletes a pipeline used for Logstash Central Management.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#logstash.delete_pipeline.Request">API
@@ -83,7 +81,7 @@ public static DeletePipelineRequest of(Function<Builder, ObjectBuilder<DeletePip
 	}
 
 	/**
-	 * Required - An identifier for the pipeline.
+	 * Required - Identifier for the pipeline.
 	 * <p>
 	 * API name: {@code id}
 	 */
@@ -103,7 +101,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
 		private String id;
 
 		/**
-		 * Required - An identifier for the pipeline.
+		 * Required - Identifier for the pipeline.
 		 * <p>
 		 * API name: {@code id}
 		 */
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/ElasticsearchLogstashAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/ElasticsearchLogstashAsyncClient.java
index 772cd4613..af70c837a 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/ElasticsearchLogstashAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/ElasticsearchLogstashAsyncClient.java
@@ -71,9 +71,7 @@ public ElasticsearchLogstashAsyncClient withTransportOptions(@Nullable Transport
 	// ----- Endpoint: logstash.delete_pipeline
 
 	/**
-	 * Delete a Logstash pipeline.
-	 * <p>
-	 * Delete a pipeline that is used for Logstash Central Management.
+	 * Deletes a pipeline used for Logstash Central Management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-delete-pipeline.html">Documentation
@@ -88,9 +86,7 @@ public CompletableFuture<BooleanResponse> deletePipeline(DeletePipelineRequest r
 	}
 
 	/**
-	 * Delete a Logstash pipeline.
-	 * <p>
-	 * Delete a pipeline that is used for Logstash Central Management.
+	 * Deletes a pipeline used for Logstash Central Management.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -108,9 +104,7 @@ public final CompletableFuture<BooleanResponse> deletePipeline(
 	// ----- Endpoint: logstash.get_pipeline
 
 	/**
-	 * Get Logstash pipelines.
-	 * <p>
-	 * Get pipelines that are used for Logstash Central Management.
+	 * Retrieves pipelines used for Logstash Central Management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-get-pipeline.html">Documentation
@@ -125,9 +119,7 @@ public CompletableFuture<GetPipelineResponse> getPipeline(GetPipelineRequest req
 	}
 
 	/**
-	 * Get Logstash pipelines.
-	 * <p>
-	 * Get pipelines that are used for Logstash Central Management.
+	 * Retrieves pipelines used for Logstash Central Management.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -143,9 +135,7 @@ public final CompletableFuture<GetPipelineResponse> getPipeline(
 	}
 
 	/**
-	 * Get Logstash pipelines.
-	 * <p>
-	 * Get pipelines that are used for Logstash Central Management.
+	 * Retrieves pipelines used for Logstash Central Management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-get-pipeline.html">Documentation
@@ -160,10 +150,7 @@ public CompletableFuture<GetPipelineResponse> getPipeline() {
 	// ----- Endpoint: logstash.put_pipeline
 
 	/**
-	 * Create or update a Logstash pipeline.
-	 * <p>
-	 * Create a pipeline that is used for Logstash Central Management. If the
-	 * specified pipeline exists, it is replaced.
+	 * Creates or updates a pipeline used for Logstash Central Management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-put-pipeline.html">Documentation
@@ -178,10 +165,7 @@ public CompletableFuture<BooleanResponse> putPipeline(PutPipelineRequest request
 	}
 
 	/**
-	 * Create or update a Logstash pipeline.
-	 * <p>
-	 * Create a pipeline that is used for Logstash Central Management. If the
-	 * specified pipeline exists, it is replaced.
+	 * Creates or updates a pipeline used for Logstash Central Management.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/ElasticsearchLogstashClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/ElasticsearchLogstashClient.java
index 874f6cdd7..d0fa36a78 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/ElasticsearchLogstashClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/ElasticsearchLogstashClient.java
@@ -69,9 +69,7 @@ public ElasticsearchLogstashClient withTransportOptions(@Nullable TransportOptio
 	// ----- Endpoint: logstash.delete_pipeline
 
 	/**
-	 * Delete a Logstash pipeline.
-	 * <p>
-	 * Delete a pipeline that is used for Logstash Central Management.
+	 * Deletes a pipeline used for Logstash Central Management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-delete-pipeline.html">Documentation
@@ -86,9 +84,7 @@ public BooleanResponse deletePipeline(DeletePipelineRequest request) throws IOEx
 	}
 
 	/**
-	 * Delete a Logstash pipeline.
-	 * <p>
-	 * Delete a pipeline that is used for Logstash Central Management.
+	 * Deletes a pipeline used for Logstash Central Management.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -107,9 +103,7 @@ public final BooleanResponse deletePipeline(
 	// ----- Endpoint: logstash.get_pipeline
 
 	/**
-	 * Get Logstash pipelines.
-	 * <p>
-	 * Get pipelines that are used for Logstash Central Management.
+	 * Retrieves pipelines used for Logstash Central Management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-get-pipeline.html">Documentation
@@ -124,9 +118,7 @@ public GetPipelineResponse getPipeline(GetPipelineRequest request) throws IOExce
 	}
 
 	/**
-	 * Get Logstash pipelines.
-	 * <p>
-	 * Get pipelines that are used for Logstash Central Management.
+	 * Retrieves pipelines used for Logstash Central Management.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -143,9 +135,7 @@ public final GetPipelineResponse getPipeline(
 	}
 
 	/**
-	 * Get Logstash pipelines.
-	 * <p>
-	 * Get pipelines that are used for Logstash Central Management.
+	 * Retrieves pipelines used for Logstash Central Management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-get-pipeline.html">Documentation
@@ -160,10 +150,7 @@ public GetPipelineResponse getPipeline() throws IOException, ElasticsearchExcept
 	// ----- Endpoint: logstash.put_pipeline
 
 	/**
-	 * Create or update a Logstash pipeline.
-	 * <p>
-	 * Create a pipeline that is used for Logstash Central Management. If the
-	 * specified pipeline exists, it is replaced.
+	 * Creates or updates a pipeline used for Logstash Central Management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/logstash-api-put-pipeline.html">Documentation
@@ -178,10 +165,7 @@ public BooleanResponse putPipeline(PutPipelineRequest request) throws IOExceptio
 	}
 
 	/**
-	 * Create or update a Logstash pipeline.
-	 * <p>
-	 * Create a pipeline that is used for Logstash Central Management. If the
-	 * specified pipeline exists, it is replaced.
+	 * Creates or updates a pipeline used for Logstash Central Management.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/GetPipelineRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/GetPipelineRequest.java
index b3e608143..bedf522d9 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/GetPipelineRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/GetPipelineRequest.java
@@ -58,9 +58,7 @@
 // typedef: logstash.get_pipeline.Request
 
 /**
- * Get Logstash pipelines.
- * <p>
- * Get pipelines that are used for Logstash Central Management.
+ * Retrieves pipelines used for Logstash Central Management.
  * 
  * @see <a href="../doc-files/api-spec.html#logstash.get_pipeline.Request">API
  *      specification</a>
@@ -82,7 +80,7 @@ public static GetPipelineRequest of(Function<Builder, ObjectBuilder<GetPipelineR
 	}
 
 	/**
-	 * A comma-separated list of pipeline identifiers.
+	 * Comma-separated list of pipeline identifiers.
 	 * <p>
 	 * API name: {@code id}
 	 */
@@ -103,7 +101,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
 		private List<String> id;
 
 		/**
-		 * A comma-separated list of pipeline identifiers.
+		 * Comma-separated list of pipeline identifiers.
 		 * <p>
 		 * API name: {@code id}
 		 * <p>
@@ -115,7 +113,7 @@ public final Builder id(List<String> list) {
 		}
 
 		/**
-		 * A comma-separated list of pipeline identifiers.
+		 * Comma-separated list of pipeline identifiers.
 		 * <p>
 		 * API name: {@code id}
 		 * <p>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/Pipeline.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/Pipeline.java
index 3619ab418..069e7da6d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/Pipeline.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/Pipeline.java
@@ -64,24 +64,24 @@ public class Pipeline implements JsonpSerializable {
 
 	private final DateTime lastModified;
 
-	private final String pipeline;
-
 	private final PipelineMetadata pipelineMetadata;
 
-	private final PipelineSettings pipelineSettings;
-
 	private final String username;
 
+	private final String pipeline;
+
+	private final PipelineSettings pipelineSettings;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private Pipeline(Builder builder) {
 
 		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
 		this.lastModified = ApiTypeHelper.requireNonNull(builder.lastModified, this, "lastModified");
-		this.pipeline = ApiTypeHelper.requireNonNull(builder.pipeline, this, "pipeline");
 		this.pipelineMetadata = ApiTypeHelper.requireNonNull(builder.pipelineMetadata, this, "pipelineMetadata");
-		this.pipelineSettings = ApiTypeHelper.requireNonNull(builder.pipelineSettings, this, "pipelineSettings");
 		this.username = ApiTypeHelper.requireNonNull(builder.username, this, "username");
+		this.pipeline = ApiTypeHelper.requireNonNull(builder.pipeline, this, "pipeline");
+		this.pipelineSettings = ApiTypeHelper.requireNonNull(builder.pipelineSettings, this, "pipelineSettings");
 
 	}
 
@@ -90,7 +90,7 @@ public static Pipeline of(Function<Builder, ObjectBuilder<Pipeline>> fn) {
 	}
 
 	/**
-	 * Required - A description of the pipeline. This description is not used by
+	 * Required - Description of the pipeline. This description is not used by
 	 * Elasticsearch or Logstash.
 	 * <p>
 	 * API name: {@code description}
@@ -100,7 +100,7 @@ public final String description() {
 	}
 
 	/**
-	 * Required - The date the pipeline was last updated. It must be in the
+	 * Required - Date the pipeline was last updated. Must be in the
 	 * <code>yyyy-MM-dd'T'HH:mm:ss.SSSZZ</code> strict_date_time format.
 	 * <p>
 	 * API name: {@code last_modified}
@@ -110,41 +110,41 @@ public final DateTime lastModified() {
 	}
 
 	/**
-	 * Required - The configuration for the pipeline.
+	 * Required - Optional metadata about the pipeline. May have any contents. This
+	 * metadata is not generated or used by Elasticsearch or Logstash.
 	 * <p>
-	 * API name: {@code pipeline}
+	 * API name: {@code pipeline_metadata}
 	 */
-	public final String pipeline() {
-		return this.pipeline;
+	public final PipelineMetadata pipelineMetadata() {
+		return this.pipelineMetadata;
 	}
 
 	/**
-	 * Required - Optional metadata about the pipeline, which can have any contents.
-	 * This metadata is not generated or used by Elasticsearch or Logstash.
+	 * Required - User who last updated the pipeline.
 	 * <p>
-	 * API name: {@code pipeline_metadata}
+	 * API name: {@code username}
 	 */
-	public final PipelineMetadata pipelineMetadata() {
-		return this.pipelineMetadata;
+	public final String username() {
+		return this.username;
 	}
 
 	/**
-	 * Required - Settings for the pipeline. It supports only flat keys in dot
-	 * notation.
+	 * Required - Configuration for the pipeline.
 	 * <p>
-	 * API name: {@code pipeline_settings}
+	 * API name: {@code pipeline}
 	 */
-	public final PipelineSettings pipelineSettings() {
-		return this.pipelineSettings;
+	public final String pipeline() {
+		return this.pipeline;
 	}
 
 	/**
-	 * Required - The user who last updated the pipeline.
+	 * Required - Settings for the pipeline. Supports only flat keys in dot
+	 * notation.
 	 * <p>
-	 * API name: {@code username}
+	 * API name: {@code pipeline_settings}
 	 */
-	public final String username() {
-		return this.username;
+	public final PipelineSettings pipelineSettings() {
+		return this.pipelineSettings;
 	}
 
 	/**
@@ -163,18 +163,18 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		generator.writeKey("last_modified");
 		this.lastModified.serialize(generator, mapper);
-		generator.writeKey("pipeline");
-		generator.write(this.pipeline);
-
 		generator.writeKey("pipeline_metadata");
 		this.pipelineMetadata.serialize(generator, mapper);
 
-		generator.writeKey("pipeline_settings");
-		this.pipelineSettings.serialize(generator, mapper);
-
 		generator.writeKey("username");
 		generator.write(this.username);
 
+		generator.writeKey("pipeline");
+		generator.write(this.pipeline);
+
+		generator.writeKey("pipeline_settings");
+		this.pipelineSettings.serialize(generator, mapper);
+
 	}
 
 	@Override
@@ -193,16 +193,16 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
 
 		private DateTime lastModified;
 
-		private String pipeline;
-
 		private PipelineMetadata pipelineMetadata;
 
-		private PipelineSettings pipelineSettings;
-
 		private String username;
 
+		private String pipeline;
+
+		private PipelineSettings pipelineSettings;
+
 		/**
-		 * Required - A description of the pipeline. This description is not used by
+		 * Required - Description of the pipeline. This description is not used by
 		 * Elasticsearch or Logstash.
 		 * <p>
 		 * API name: {@code description}
@@ -213,7 +213,7 @@ public final Builder description(String value) {
 		}
 
 		/**
-		 * Required - The date the pipeline was last updated. It must be in the
+		 * Required - Date the pipeline was last updated. Must be in the
 		 * <code>yyyy-MM-dd'T'HH:mm:ss.SSSZZ</code> strict_date_time format.
 		 * <p>
 		 * API name: {@code last_modified}
@@ -224,38 +224,48 @@ public final Builder lastModified(DateTime value) {
 		}
 
 		/**
-		 * Required - The configuration for the pipeline.
+		 * Required - Optional metadata about the pipeline. May have any contents. This
+		 * metadata is not generated or used by Elasticsearch or Logstash.
 		 * <p>
-		 * API name: {@code pipeline}
+		 * API name: {@code pipeline_metadata}
 		 */
-		public final Builder pipeline(String value) {
-			this.pipeline = value;
+		public final Builder pipelineMetadata(PipelineMetadata value) {
+			this.pipelineMetadata = value;
 			return this;
 		}
 
 		/**
-		 * Required - Optional metadata about the pipeline, which can have any contents.
-		 * This metadata is not generated or used by Elasticsearch or Logstash.
+		 * Required - Optional metadata about the pipeline. May have any contents. This
+		 * metadata is not generated or used by Elasticsearch or Logstash.
 		 * <p>
 		 * API name: {@code pipeline_metadata}
 		 */
-		public final Builder pipelineMetadata(PipelineMetadata value) {
-			this.pipelineMetadata = value;
+		public final Builder pipelineMetadata(Function<PipelineMetadata.Builder, ObjectBuilder<PipelineMetadata>> fn) {
+			return this.pipelineMetadata(fn.apply(new PipelineMetadata.Builder()).build());
+		}
+
+		/**
+		 * Required - User who last updated the pipeline.
+		 * <p>
+		 * API name: {@code username}
+		 */
+		public final Builder username(String value) {
+			this.username = value;
 			return this;
 		}
 
 		/**
-		 * Required - Optional metadata about the pipeline, which can have any contents.
-		 * This metadata is not generated or used by Elasticsearch or Logstash.
+		 * Required - Configuration for the pipeline.
 		 * <p>
-		 * API name: {@code pipeline_metadata}
+		 * API name: {@code pipeline}
 		 */
-		public final Builder pipelineMetadata(Function<PipelineMetadata.Builder, ObjectBuilder<PipelineMetadata>> fn) {
-			return this.pipelineMetadata(fn.apply(new PipelineMetadata.Builder()).build());
+		public final Builder pipeline(String value) {
+			this.pipeline = value;
+			return this;
 		}
 
 		/**
-		 * Required - Settings for the pipeline. It supports only flat keys in dot
+		 * Required - Settings for the pipeline. Supports only flat keys in dot
 		 * notation.
 		 * <p>
 		 * API name: {@code pipeline_settings}
@@ -266,7 +276,7 @@ public final Builder pipelineSettings(PipelineSettings value) {
 		}
 
 		/**
-		 * Required - Settings for the pipeline. It supports only flat keys in dot
+		 * Required - Settings for the pipeline. Supports only flat keys in dot
 		 * notation.
 		 * <p>
 		 * API name: {@code pipeline_settings}
@@ -275,16 +285,6 @@ public final Builder pipelineSettings(Function<PipelineSettings.Builder, ObjectB
 			return this.pipelineSettings(fn.apply(new PipelineSettings.Builder()).build());
 		}
 
-		/**
-		 * Required - The user who last updated the pipeline.
-		 * <p>
-		 * API name: {@code username}
-		 */
-		public final Builder username(String value) {
-			this.username = value;
-			return this;
-		}
-
 		@Override
 		protected Builder self() {
 			return this;
@@ -315,10 +315,10 @@ protected static void setupPipelineDeserializer(ObjectDeserializer<Pipeline.Buil
 
 		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
 		op.add(Builder::lastModified, DateTime._DESERIALIZER, "last_modified");
-		op.add(Builder::pipeline, JsonpDeserializer.stringDeserializer(), "pipeline");
 		op.add(Builder::pipelineMetadata, PipelineMetadata._DESERIALIZER, "pipeline_metadata");
-		op.add(Builder::pipelineSettings, PipelineSettings._DESERIALIZER, "pipeline_settings");
 		op.add(Builder::username, JsonpDeserializer.stringDeserializer(), "username");
+		op.add(Builder::pipeline, JsonpDeserializer.stringDeserializer(), "pipeline");
+		op.add(Builder::pipelineSettings, PipelineSettings._DESERIALIZER, "pipeline_settings");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/PutPipelineRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/PutPipelineRequest.java
index d8ef0378d..103acb380 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/PutPipelineRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/logstash/PutPipelineRequest.java
@@ -61,10 +61,7 @@
 // typedef: logstash.put_pipeline.Request
 
 /**
- * Create or update a Logstash pipeline.
- * <p>
- * Create a pipeline that is used for Logstash Central Management. If the
- * specified pipeline exists, it is replaced.
+ * Creates or updates a pipeline used for Logstash Central Management.
  * 
  * @see <a href="../doc-files/api-spec.html#logstash.put_pipeline.Request">API
  *      specification</a>
@@ -89,7 +86,7 @@ public static PutPipelineRequest of(Function<Builder, ObjectBuilder<PutPipelineR
 	}
 
 	/**
-	 * Required - An identifier for the pipeline.
+	 * Required - Identifier for the pipeline.
 	 * <p>
 	 * API name: {@code id}
 	 */
@@ -126,7 +123,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder>
 		private Pipeline pipeline;
 
 		/**
-		 * Required - An identifier for the pipeline.
+		 * Required - Identifier for the pipeline.
 		 * <p>
 		 * API name: {@code id}
 		 */
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/DeprecationsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/DeprecationsRequest.java
index 394685c4c..852165c22 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/DeprecationsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/DeprecationsRequest.java
@@ -55,12 +55,9 @@
 // typedef: migration.deprecations.Request
 
 /**
- * Get deprecation information. Get information about different cluster, node,
- * and index level settings that use deprecated features that will be removed or
- * changed in the next major version.
- * <p>
- * TIP: This APIs is designed for indirect use by the Upgrade Assistant. We
- * strongly recommend you use the Upgrade Assistant.
+ * Retrieves information about different cluster, node, and index level settings
+ * that use deprecated features that will be removed or changed in the next
+ * major version.
  * 
  * @see <a href="../doc-files/api-spec.html#migration.deprecations.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/ElasticsearchMigrationAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/ElasticsearchMigrationAsyncClient.java
index 194c9aa01..a897b8d56 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/ElasticsearchMigrationAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/ElasticsearchMigrationAsyncClient.java
@@ -70,12 +70,9 @@ public ElasticsearchMigrationAsyncClient withTransportOptions(@Nullable Transpor
 	// ----- Endpoint: migration.deprecations
 
 	/**
-	 * Get deprecation information. Get information about different cluster, node,
-	 * and index level settings that use deprecated features that will be removed or
-	 * changed in the next major version.
-	 * <p>
-	 * TIP: This APIs is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Retrieves information about different cluster, node, and index level settings
+	 * that use deprecated features that will be removed or changed in the next
+	 * major version.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html">Documentation
@@ -90,12 +87,9 @@ public CompletableFuture<DeprecationsResponse> deprecations(DeprecationsRequest
 	}
 
 	/**
-	 * Get deprecation information. Get information about different cluster, node,
-	 * and index level settings that use deprecated features that will be removed or
-	 * changed in the next major version.
-	 * <p>
-	 * TIP: This APIs is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Retrieves information about different cluster, node, and index level settings
+	 * that use deprecated features that will be removed or changed in the next
+	 * major version.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -111,12 +105,9 @@ public final CompletableFuture<DeprecationsResponse> deprecations(
 	}
 
 	/**
-	 * Get deprecation information. Get information about different cluster, node,
-	 * and index level settings that use deprecated features that will be removed or
-	 * changed in the next major version.
-	 * <p>
-	 * TIP: This APIs is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Retrieves information about different cluster, node, and index level settings
+	 * that use deprecated features that will be removed or changed in the next
+	 * major version.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html">Documentation
@@ -131,13 +122,7 @@ public CompletableFuture<DeprecationsResponse> deprecations() {
 	// ----- Endpoint: migration.get_feature_upgrade_status
 
 	/**
-	 * Get feature migration information. Version upgrades sometimes require changes
-	 * to how features store configuration information and data in system indices.
-	 * Check which features need to be migrated and the status of any migrations
-	 * that are in progress.
-	 * <p>
-	 * TIP: This API is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Find out whether system features need to be upgraded or not
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-feature-upgrade.html">Documentation
@@ -151,15 +136,7 @@ public CompletableFuture<GetFeatureUpgradeStatusResponse> getFeatureUpgradeStatu
 	// ----- Endpoint: migration.post_feature_upgrade
 
 	/**
-	 * Start the feature migration. Version upgrades sometimes require changes to
-	 * how features store configuration information and data in system indices. This
-	 * API starts the automatic migration process.
-	 * <p>
-	 * Some functionality might be temporarily unavailable during the migration
-	 * process.
-	 * <p>
-	 * TIP: The API is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Begin upgrades for system features
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-feature-upgrade.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/ElasticsearchMigrationClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/ElasticsearchMigrationClient.java
index b9e21bb84..0ec1c3ffd 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/ElasticsearchMigrationClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/ElasticsearchMigrationClient.java
@@ -68,12 +68,9 @@ public ElasticsearchMigrationClient withTransportOptions(@Nullable TransportOpti
 	// ----- Endpoint: migration.deprecations
 
 	/**
-	 * Get deprecation information. Get information about different cluster, node,
-	 * and index level settings that use deprecated features that will be removed or
-	 * changed in the next major version.
-	 * <p>
-	 * TIP: This APIs is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Retrieves information about different cluster, node, and index level settings
+	 * that use deprecated features that will be removed or changed in the next
+	 * major version.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html">Documentation
@@ -88,12 +85,9 @@ public DeprecationsResponse deprecations(DeprecationsRequest request) throws IOE
 	}
 
 	/**
-	 * Get deprecation information. Get information about different cluster, node,
-	 * and index level settings that use deprecated features that will be removed or
-	 * changed in the next major version.
-	 * <p>
-	 * TIP: This APIs is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Retrieves information about different cluster, node, and index level settings
+	 * that use deprecated features that will be removed or changed in the next
+	 * major version.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -110,12 +104,9 @@ public final DeprecationsResponse deprecations(
 	}
 
 	/**
-	 * Get deprecation information. Get information about different cluster, node,
-	 * and index level settings that use deprecated features that will be removed or
-	 * changed in the next major version.
-	 * <p>
-	 * TIP: This APIs is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Retrieves information about different cluster, node, and index level settings
+	 * that use deprecated features that will be removed or changed in the next
+	 * major version.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html">Documentation
@@ -130,13 +121,7 @@ public DeprecationsResponse deprecations() throws IOException, ElasticsearchExce
 	// ----- Endpoint: migration.get_feature_upgrade_status
 
 	/**
-	 * Get feature migration information. Version upgrades sometimes require changes
-	 * to how features store configuration information and data in system indices.
-	 * Check which features need to be migrated and the status of any migrations
-	 * that are in progress.
-	 * <p>
-	 * TIP: This API is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Find out whether system features need to be upgraded or not
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-feature-upgrade.html">Documentation
@@ -150,15 +135,7 @@ public GetFeatureUpgradeStatusResponse getFeatureUpgradeStatus() throws IOExcept
 	// ----- Endpoint: migration.post_feature_upgrade
 
 	/**
-	 * Start the feature migration. Version upgrades sometimes require changes to
-	 * how features store configuration information and data in system indices. This
-	 * API starts the automatic migration process.
-	 * <p>
-	 * Some functionality might be temporarily unavailable during the migration
-	 * process.
-	 * <p>
-	 * TIP: The API is designed for indirect use by the Upgrade Assistant. We
-	 * strongly recommend you use the Upgrade Assistant.
+	 * Begin upgrades for system features
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-feature-upgrade.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/GetFeatureUpgradeStatusRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/GetFeatureUpgradeStatusRequest.java
index f9d0cf485..27411dc69 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/GetFeatureUpgradeStatusRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/GetFeatureUpgradeStatusRequest.java
@@ -50,13 +50,7 @@
 // typedef: migration.get_feature_upgrade_status.Request
 
 /**
- * Get feature migration information. Version upgrades sometimes require changes
- * to how features store configuration information and data in system indices.
- * Check which features need to be migrated and the status of any migrations
- * that are in progress.
- * <p>
- * TIP: This API is designed for indirect use by the Upgrade Assistant. We
- * strongly recommend you use the Upgrade Assistant.
+ * Find out whether system features need to be upgraded or not
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#migration.get_feature_upgrade_status.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/PostFeatureUpgradeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/PostFeatureUpgradeRequest.java
index 95e329319..c016b79f8 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/PostFeatureUpgradeRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/migration/PostFeatureUpgradeRequest.java
@@ -50,15 +50,7 @@
 // typedef: migration.post_feature_upgrade.Request
 
 /**
- * Start the feature migration. Version upgrades sometimes require changes to
- * how features store configuration information and data in system indices. This
- * API starts the automatic migration process.
- * <p>
- * Some functionality might be temporarily unavailable during the migration
- * process.
- * <p>
- * TIP: The API is designed for indirect use by the Upgrade Assistant. We
- * strongly recommend you use the Upgrade Assistant.
+ * Begin upgrades for system features
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#migration.post_feature_upgrade.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/CalendarEvent.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/CalendarEvent.java
index 20c86c0ae..ebea147de 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/CalendarEvent.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/CalendarEvent.java
@@ -31,8 +31,6 @@
 import co.elastic.clients.util.ObjectBuilder;
 import co.elastic.clients.util.WithJsonObjectBuilderBase;
 import jakarta.json.stream.JsonGenerator;
-import java.lang.Boolean;
-import java.lang.Integer;
 import java.lang.String;
 import java.util.Objects;
 import java.util.function.Function;
@@ -74,15 +72,6 @@ public class CalendarEvent implements JsonpSerializable {
 
 	private final DateTime startTime;
 
-	@Nullable
-	private final Boolean skipResult;
-
-	@Nullable
-	private final Boolean skipModelUpdate;
-
-	@Nullable
-	private final Integer forceTimeShift;
-
 	// ---------------------------------------------------------------------------------------------
 
 	private CalendarEvent(Builder builder) {
@@ -92,9 +81,6 @@ private CalendarEvent(Builder builder) {
 		this.description = ApiTypeHelper.requireNonNull(builder.description, this, "description");
 		this.endTime = ApiTypeHelper.requireNonNull(builder.endTime, this, "endTime");
 		this.startTime = ApiTypeHelper.requireNonNull(builder.startTime, this, "startTime");
-		this.skipResult = builder.skipResult;
-		this.skipModelUpdate = builder.skipModelUpdate;
-		this.forceTimeShift = builder.forceTimeShift;
 
 	}
 
@@ -149,37 +135,6 @@ public final DateTime startTime() {
 		return this.startTime;
 	}
 
-	/**
-	 * When true the model will not create results for this calendar period.
-	 * <p>
-	 * API name: {@code skip_result}
-	 */
-	@Nullable
-	public final Boolean skipResult() {
-		return this.skipResult;
-	}
-
-	/**
-	 * When true the model will not be updated for this calendar period.
-	 * <p>
-	 * API name: {@code skip_model_update}
-	 */
-	@Nullable
-	public final Boolean skipModelUpdate() {
-		return this.skipModelUpdate;
-	}
-
-	/**
-	 * Shift time by this many seconds. For example adjust time for daylight savings
-	 * changes
-	 * <p>
-	 * API name: {@code force_time_shift}
-	 */
-	@Nullable
-	public final Integer forceTimeShift() {
-		return this.forceTimeShift;
-	}
-
 	/**
 	 * Serialize this object to JSON.
 	 */
@@ -208,21 +163,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 		this.endTime.serialize(generator, mapper);
 		generator.writeKey("start_time");
 		this.startTime.serialize(generator, mapper);
-		if (this.skipResult != null) {
-			generator.writeKey("skip_result");
-			generator.write(this.skipResult);
-
-		}
-		if (this.skipModelUpdate != null) {
-			generator.writeKey("skip_model_update");
-			generator.write(this.skipModelUpdate);
-
-		}
-		if (this.forceTimeShift != null) {
-			generator.writeKey("force_time_shift");
-			generator.write(this.forceTimeShift);
-
-		}
 
 	}
 
@@ -250,15 +190,6 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
 
 		private DateTime startTime;
 
-		@Nullable
-		private Boolean skipResult;
-
-		@Nullable
-		private Boolean skipModelUpdate;
-
-		@Nullable
-		private Integer forceTimeShift;
-
 		/**
 		 * A string that uniquely identifies a calendar.
 		 * <p>
@@ -309,37 +240,6 @@ public final Builder startTime(DateTime value) {
 			return this;
 		}
 
-		/**
-		 * When true the model will not create results for this calendar period.
-		 * <p>
-		 * API name: {@code skip_result}
-		 */
-		public final Builder skipResult(@Nullable Boolean value) {
-			this.skipResult = value;
-			return this;
-		}
-
-		/**
-		 * When true the model will not be updated for this calendar period.
-		 * <p>
-		 * API name: {@code skip_model_update}
-		 */
-		public final Builder skipModelUpdate(@Nullable Boolean value) {
-			this.skipModelUpdate = value;
-			return this;
-		}
-
-		/**
-		 * Shift time by this many seconds. For example adjust time for daylight savings
-		 * changes
-		 * <p>
-		 * API name: {@code force_time_shift}
-		 */
-		public final Builder forceTimeShift(@Nullable Integer value) {
-			this.forceTimeShift = value;
-			return this;
-		}
-
 		@Override
 		protected Builder self() {
 			return this;
@@ -373,9 +273,6 @@ protected static void setupCalendarEventDeserializer(ObjectDeserializer<Calendar
 		op.add(Builder::description, JsonpDeserializer.stringDeserializer(), "description");
 		op.add(Builder::endTime, DateTime._DESERIALIZER, "end_time");
 		op.add(Builder::startTime, DateTime._DESERIALIZER, "start_time");
-		op.add(Builder::skipResult, JsonpDeserializer.booleanDeserializer(), "skip_result");
-		op.add(Builder::skipModelUpdate, JsonpDeserializer.booleanDeserializer(), "skip_model_update");
-		op.add(Builder::forceTimeShift, JsonpDeserializer.integerDeserializer(), "force_time_shift");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ElasticsearchMlAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ElasticsearchMlAsyncClient.java
index 52d44aee5..2ed26bfaf 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ElasticsearchMlAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ElasticsearchMlAsyncClient.java
@@ -1832,7 +1832,7 @@ public final CompletableFuture<InferTrainedModelResponse> inferTrainedModel(
 	// ----- Endpoint: ml.info
 
 	/**
-	 * Get machine learning information. Get defaults and limits used by machine
+	 * Return ML defaults and limits. Returns defaults and limits used by machine
 	 * learning. This endpoint is designed to be used by a user interface that needs
 	 * to fully understand machine learning configurations where some options are
 	 * not specified, meaning that the defaults should be used. This endpoint may be
@@ -2236,14 +2236,9 @@ public final CompletableFuture<PutDataFrameAnalyticsResponse> putDataFrameAnalyt
 	 * an anomaly detection job. You can associate only one datafeed with each
 	 * anomaly detection job. The datafeed contains a query that runs at a defined
 	 * interval (<code>frequency</code>). If you are concerned about delayed data,
-	 * you can add a delay (<code>query_delay</code>) at each interval. When
-	 * Elasticsearch security features are enabled, your datafeed remembers which
-	 * roles the user who created it had at the time of creation and runs the query
-	 * using those same roles. If you provide secondary authorization headers, those
-	 * credentials are used instead. You must use Kibana, this API, or the create
-	 * anomaly detection jobs API to create a datafeed. Do not add a datafeed
-	 * directly to the <code>.ml-config</code> index. Do not give users
-	 * <code>write</code> privileges on the <code>.ml-config</code> index.
+	 * you can add a delay
+	 * (<code>query_delay') at each interval. When Elasticsearch security features are enabled, your datafeed remembers which roles the user who created it had at the time of creation and runs the query using those same roles. If you provide secondary authorization headers, those credentials are used instead. You must use Kibana, this API, or the create anomaly detection jobs API to create a datafeed. Do not add a datafeed directly to the </code>.ml-config<code>index. Do not give users</code>write<code>privileges on the</code>.ml-config`
+	 * index.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-datafeed.html">Documentation
@@ -2262,14 +2257,9 @@ public CompletableFuture<PutDatafeedResponse> putDatafeed(PutDatafeedRequest req
 	 * an anomaly detection job. You can associate only one datafeed with each
 	 * anomaly detection job. The datafeed contains a query that runs at a defined
 	 * interval (<code>frequency</code>). If you are concerned about delayed data,
-	 * you can add a delay (<code>query_delay</code>) at each interval. When
-	 * Elasticsearch security features are enabled, your datafeed remembers which
-	 * roles the user who created it had at the time of creation and runs the query
-	 * using those same roles. If you provide secondary authorization headers, those
-	 * credentials are used instead. You must use Kibana, this API, or the create
-	 * anomaly detection jobs API to create a datafeed. Do not add a datafeed
-	 * directly to the <code>.ml-config</code> index. Do not give users
-	 * <code>write</code> privileges on the <code>.ml-config</code> index.
+	 * you can add a delay
+	 * (<code>query_delay') at each interval. When Elasticsearch security features are enabled, your datafeed remembers which roles the user who created it had at the time of creation and runs the query using those same roles. If you provide secondary authorization headers, those credentials are used instead. You must use Kibana, this API, or the create anomaly detection jobs API to create a datafeed. Do not add a datafeed directly to the </code>.ml-config<code>index. Do not give users</code>write<code>privileges on the</code>.ml-config`
+	 * index.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -3256,7 +3246,7 @@ public CompletableFuture<ValidateResponse> validate() {
 	// ----- Endpoint: ml.validate_detector
 
 	/**
-	 * Validate an anomaly detection job.
+	 * Validates an anomaly detection detector.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html">Documentation
@@ -3271,7 +3261,7 @@ public CompletableFuture<ValidateDetectorResponse> validateDetector(ValidateDete
 	}
 
 	/**
-	 * Validate an anomaly detection job.
+	 * Validates an anomaly detection detector.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -3287,7 +3277,7 @@ public final CompletableFuture<ValidateDetectorResponse> validateDetector(
 	}
 
 	/**
-	 * Validate an anomaly detection job.
+	 * Validates an anomaly detection detector.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ElasticsearchMlClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ElasticsearchMlClient.java
index b96659890..347da76d1 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ElasticsearchMlClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ElasticsearchMlClient.java
@@ -1883,7 +1883,7 @@ public final InferTrainedModelResponse inferTrainedModel(
 	// ----- Endpoint: ml.info
 
 	/**
-	 * Get machine learning information. Get defaults and limits used by machine
+	 * Return ML defaults and limits. Returns defaults and limits used by machine
 	 * learning. This endpoint is designed to be used by a user interface that needs
 	 * to fully understand machine learning configurations where some options are
 	 * not specified, meaning that the defaults should be used. This endpoint may be
@@ -2296,14 +2296,9 @@ public final PutDataFrameAnalyticsResponse putDataFrameAnalytics(
 	 * an anomaly detection job. You can associate only one datafeed with each
 	 * anomaly detection job. The datafeed contains a query that runs at a defined
 	 * interval (<code>frequency</code>). If you are concerned about delayed data,
-	 * you can add a delay (<code>query_delay</code>) at each interval. When
-	 * Elasticsearch security features are enabled, your datafeed remembers which
-	 * roles the user who created it had at the time of creation and runs the query
-	 * using those same roles. If you provide secondary authorization headers, those
-	 * credentials are used instead. You must use Kibana, this API, or the create
-	 * anomaly detection jobs API to create a datafeed. Do not add a datafeed
-	 * directly to the <code>.ml-config</code> index. Do not give users
-	 * <code>write</code> privileges on the <code>.ml-config</code> index.
+	 * you can add a delay
+	 * (<code>query_delay') at each interval. When Elasticsearch security features are enabled, your datafeed remembers which roles the user who created it had at the time of creation and runs the query using those same roles. If you provide secondary authorization headers, those credentials are used instead. You must use Kibana, this API, or the create anomaly detection jobs API to create a datafeed. Do not add a datafeed directly to the </code>.ml-config<code>index. Do not give users</code>write<code>privileges on the</code>.ml-config`
+	 * index.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-datafeed.html">Documentation
@@ -2322,14 +2317,9 @@ public PutDatafeedResponse putDatafeed(PutDatafeedRequest request) throws IOExce
 	 * an anomaly detection job. You can associate only one datafeed with each
 	 * anomaly detection job. The datafeed contains a query that runs at a defined
 	 * interval (<code>frequency</code>). If you are concerned about delayed data,
-	 * you can add a delay (<code>query_delay</code>) at each interval. When
-	 * Elasticsearch security features are enabled, your datafeed remembers which
-	 * roles the user who created it had at the time of creation and runs the query
-	 * using those same roles. If you provide secondary authorization headers, those
-	 * credentials are used instead. You must use Kibana, this API, or the create
-	 * anomaly detection jobs API to create a datafeed. Do not add a datafeed
-	 * directly to the <code>.ml-config</code> index. Do not give users
-	 * <code>write</code> privileges on the <code>.ml-config</code> index.
+	 * you can add a delay
+	 * (<code>query_delay') at each interval. When Elasticsearch security features are enabled, your datafeed remembers which roles the user who created it had at the time of creation and runs the query using those same roles. If you provide secondary authorization headers, those credentials are used instead. You must use Kibana, this API, or the create anomaly detection jobs API to create a datafeed. Do not add a datafeed directly to the </code>.ml-config<code>index. Do not give users</code>write<code>privileges on the</code>.ml-config`
+	 * index.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -3343,7 +3333,7 @@ public ValidateResponse validate() throws IOException, ElasticsearchException {
 	// ----- Endpoint: ml.validate_detector
 
 	/**
-	 * Validate an anomaly detection job.
+	 * Validates an anomaly detection detector.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html">Documentation
@@ -3359,7 +3349,7 @@ public ValidateDetectorResponse validateDetector(ValidateDetectorRequest request
 	}
 
 	/**
-	 * Validate an anomaly detection job.
+	 * Validates an anomaly detection detector.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -3376,7 +3366,7 @@ public final ValidateDetectorResponse validateDetector(
 	}
 
 	/**
-	 * Validate an anomaly detection job.
+	 * Validates an anomaly detection detector.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/MlInfoRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/MlInfoRequest.java
index ebc509a2e..eb99d7a47 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/MlInfoRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/MlInfoRequest.java
@@ -50,7 +50,7 @@
 // typedef: ml.info.Request
 
 /**
- * Get machine learning information. Get defaults and limits used by machine
+ * Return ML defaults and limits. Returns defaults and limits used by machine
  * learning. This endpoint is designed to be used by a user interface that needs
  * to fully understand machine learning configurations where some options are
  * not specified, meaning that the defaults should be used. This endpoint may be
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutDatafeedRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutDatafeedRequest.java
index 959991750..7afc7468d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutDatafeedRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/PutDatafeedRequest.java
@@ -72,14 +72,9 @@
  * an anomaly detection job. You can associate only one datafeed with each
  * anomaly detection job. The datafeed contains a query that runs at a defined
  * interval (<code>frequency</code>). If you are concerned about delayed data,
- * you can add a delay (<code>query_delay</code>) at each interval. When
- * Elasticsearch security features are enabled, your datafeed remembers which
- * roles the user who created it had at the time of creation and runs the query
- * using those same roles. If you provide secondary authorization headers, those
- * credentials are used instead. You must use Kibana, this API, or the create
- * anomaly detection jobs API to create a datafeed. Do not add a datafeed
- * directly to the <code>.ml-config</code> index. Do not give users
- * <code>write</code> privileges on the <code>.ml-config</code> index.
+ * you can add a delay
+ * (<code>query_delay') at each interval. When Elasticsearch security features are enabled, your datafeed remembers which roles the user who created it had at the time of creation and runs the query using those same roles. If you provide secondary authorization headers, those credentials are used instead. You must use Kibana, this API, or the create anomaly detection jobs API to create a datafeed. Do not add a datafeed directly to the </code>.ml-config<code>index. Do not give users</code>write<code>privileges on the</code>.ml-config`
+ * index.
  * 
  * @see <a href="../doc-files/api-spec.html#ml.put_datafeed.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ValidateDetectorRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ValidateDetectorRequest.java
index c7d84909c..bb3e5f3b5 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ValidateDetectorRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/ValidateDetectorRequest.java
@@ -56,7 +56,7 @@
 // typedef: ml.validate_detector.Request
 
 /**
- * Validate an anomaly detection job.
+ * Validates an anomaly detection detector.
  * 
  * @see <a href="../doc-files/api-spec.html#ml.validate_detector.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/BulkRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/BulkRequest.java
index dbb680041..768360106 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/BulkRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/BulkRequest.java
@@ -62,8 +62,7 @@
 // typedef: monitoring.bulk.Request
 
 /**
- * Send monitoring data. This API is used by the monitoring features to send
- * monitoring data.
+ * Used by the monitoring features to send monitoring data.
  * 
  * @see <a href="../doc-files/api-spec.html#monitoring.bulk.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/ElasticsearchMonitoringAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/ElasticsearchMonitoringAsyncClient.java
index 9dc19d082..aad05d73a 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/ElasticsearchMonitoringAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/ElasticsearchMonitoringAsyncClient.java
@@ -70,8 +70,7 @@ public ElasticsearchMonitoringAsyncClient withTransportOptions(@Nullable Transpo
 	// ----- Endpoint: monitoring.bulk
 
 	/**
-	 * Send monitoring data. This API is used by the monitoring features to send
-	 * monitoring data.
+	 * Used by the monitoring features to send monitoring data.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/monitor-elasticsearch-cluster.html">Documentation
@@ -86,8 +85,7 @@ public CompletableFuture<BulkResponse> bulk(BulkRequest request) {
 	}
 
 	/**
-	 * Send monitoring data. This API is used by the monitoring features to send
-	 * monitoring data.
+	 * Used by the monitoring features to send monitoring data.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/ElasticsearchMonitoringClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/ElasticsearchMonitoringClient.java
index 1ad60de63..0c0fb8752 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/ElasticsearchMonitoringClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/monitoring/ElasticsearchMonitoringClient.java
@@ -69,8 +69,7 @@ public ElasticsearchMonitoringClient withTransportOptions(@Nullable TransportOpt
 	// ----- Endpoint: monitoring.bulk
 
 	/**
-	 * Send monitoring data. This API is used by the monitoring features to send
-	 * monitoring data.
+	 * Used by the monitoring features to send monitoring data.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/monitor-elasticsearch-cluster.html">Documentation
@@ -85,8 +84,7 @@ public BulkResponse bulk(BulkRequest request) throws IOException, ElasticsearchE
 	}
 
 	/**
-	 * Send monitoring data. This API is used by the monitoring features to send
-	 * monitoring data.
+	 * Used by the monitoring features to send monitoring data.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/DeleteJobRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/DeleteJobRequest.java
index bf077086d..8abae242c 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/DeleteJobRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/DeleteJobRequest.java
@@ -56,36 +56,8 @@
 // typedef: rollup.delete_job.Request
 
 /**
- * Delete a rollup job.
- * <p>
- * A job must be stopped before it can be deleted. If you attempt to delete a
- * started job, an error occurs. Similarly, if you attempt to delete a
- * nonexistent job, an exception occurs.
- * <p>
- * IMPORTANT: When you delete a job, you remove only the process that is
- * actively monitoring and rolling up data. The API does not delete any
- * previously rolled up data. This is by design; a user may wish to roll up a
- * static data set. Because the data set is static, after it has been fully
- * rolled up there is no need to keep the indexing rollup job around (as there
- * will be no new data). Thus the job can be deleted, leaving behind the rolled
- * up data for analysis. If you wish to also remove the rollup data and the
- * rollup index contains the data for only a single job, you can delete the
- * whole rollup index. If the rollup index stores data from several jobs, you
- * must issue a delete-by-query that targets the rollup job's identifier in the
- * rollup index. For example:
+ * Deletes an existing rollup job.
  * 
- * <pre>
- * <code>POST my_rollup_index/_delete_by_query
- * {
- *   &quot;query&quot;: {
- *     &quot;term&quot;: {
- *       &quot;_rollup.id&quot;: &quot;the_rollup_job_id&quot;
- *     }
- *   }
- * }
- * </code>
- * </pre>
- *
  * @see <a href="../doc-files/api-spec.html#rollup.delete_job.Request">API
  *      specification</a>
  */
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/ElasticsearchRollupAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/ElasticsearchRollupAsyncClient.java
index 1c5b12922..f564b55ba 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/ElasticsearchRollupAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/ElasticsearchRollupAsyncClient.java
@@ -70,36 +70,8 @@ public ElasticsearchRollupAsyncClient withTransportOptions(@Nullable TransportOp
 	// ----- Endpoint: rollup.delete_job
 
 	/**
-	 * Delete a rollup job.
-	 * <p>
-	 * A job must be stopped before it can be deleted. If you attempt to delete a
-	 * started job, an error occurs. Similarly, if you attempt to delete a
-	 * nonexistent job, an exception occurs.
-	 * <p>
-	 * IMPORTANT: When you delete a job, you remove only the process that is
-	 * actively monitoring and rolling up data. The API does not delete any
-	 * previously rolled up data. This is by design; a user may wish to roll up a
-	 * static data set. Because the data set is static, after it has been fully
-	 * rolled up there is no need to keep the indexing rollup job around (as there
-	 * will be no new data). Thus the job can be deleted, leaving behind the rolled
-	 * up data for analysis. If you wish to also remove the rollup data and the
-	 * rollup index contains the data for only a single job, you can delete the
-	 * whole rollup index. If the rollup index stores data from several jobs, you
-	 * must issue a delete-by-query that targets the rollup job's identifier in the
-	 * rollup index. For example:
+	 * Deletes an existing rollup job.
 	 * 
-	 * <pre>
-	 * <code>POST my_rollup_index/_delete_by_query
-	 * {
-	 *   &quot;query&quot;: {
-	 *     &quot;term&quot;: {
-	 *       &quot;_rollup.id&quot;: &quot;the_rollup_job_id&quot;
-	 *     }
-	 *   }
-	 * }
-	 * </code>
-	 * </pre>
-	 *
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-delete-job.html">Documentation
 	 *      on elastic.co</a>
@@ -113,36 +85,8 @@ public CompletableFuture<DeleteJobResponse> deleteJob(DeleteJobRequest request)
 	}
 
 	/**
-	 * Delete a rollup job.
-	 * <p>
-	 * A job must be stopped before it can be deleted. If you attempt to delete a
-	 * started job, an error occurs. Similarly, if you attempt to delete a
-	 * nonexistent job, an exception occurs.
-	 * <p>
-	 * IMPORTANT: When you delete a job, you remove only the process that is
-	 * actively monitoring and rolling up data. The API does not delete any
-	 * previously rolled up data. This is by design; a user may wish to roll up a
-	 * static data set. Because the data set is static, after it has been fully
-	 * rolled up there is no need to keep the indexing rollup job around (as there
-	 * will be no new data). Thus the job can be deleted, leaving behind the rolled
-	 * up data for analysis. If you wish to also remove the rollup data and the
-	 * rollup index contains the data for only a single job, you can delete the
-	 * whole rollup index. If the rollup index stores data from several jobs, you
-	 * must issue a delete-by-query that targets the rollup job's identifier in the
-	 * rollup index. For example:
+	 * Deletes an existing rollup job.
 	 * 
-	 * <pre>
-	 * <code>POST my_rollup_index/_delete_by_query
-	 * {
-	 *   &quot;query&quot;: {
-	 *     &quot;term&quot;: {
-	 *       &quot;_rollup.id&quot;: &quot;the_rollup_job_id&quot;
-	 *     }
-	 *   }
-	 * }
-	 * </code>
-	 * </pre>
-	 *
 	 * @param fn
 	 *            a function that initializes a builder to create the
 	 *            {@link DeleteJobRequest}
@@ -159,13 +103,7 @@ public final CompletableFuture<DeleteJobResponse> deleteJob(
 	// ----- Endpoint: rollup.get_jobs
 
 	/**
-	 * Get rollup job information. Get the configuration, stats, and status of
-	 * rollup jobs.
-	 * <p>
-	 * NOTE: This API returns only active (both <code>STARTED</code> and
-	 * <code>STOPPED</code>) jobs. If a job was created, ran for a while, then was
-	 * deleted, the API does not return any details about it. For details about a
-	 * historical rollup job, the rollup capabilities API may be more useful.
+	 * Retrieves the configuration, stats, and status of rollup jobs.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-job.html">Documentation
@@ -180,13 +118,7 @@ public CompletableFuture<GetJobsResponse> getJobs(GetJobsRequest request) {
 	}
 
 	/**
-	 * Get rollup job information. Get the configuration, stats, and status of
-	 * rollup jobs.
-	 * <p>
-	 * NOTE: This API returns only active (both <code>STARTED</code> and
-	 * <code>STOPPED</code>) jobs. If a job was created, ran for a while, then was
-	 * deleted, the API does not return any details about it. For details about a
-	 * historical rollup job, the rollup capabilities API may be more useful.
+	 * Retrieves the configuration, stats, and status of rollup jobs.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -202,13 +134,7 @@ public final CompletableFuture<GetJobsResponse> getJobs(
 	}
 
 	/**
-	 * Get rollup job information. Get the configuration, stats, and status of
-	 * rollup jobs.
-	 * <p>
-	 * NOTE: This API returns only active (both <code>STARTED</code> and
-	 * <code>STOPPED</code>) jobs. If a job was created, ran for a while, then was
-	 * deleted, the API does not return any details about it. For details about a
-	 * historical rollup job, the rollup capabilities API may be more useful.
+	 * Retrieves the configuration, stats, and status of rollup jobs.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-job.html">Documentation
@@ -223,21 +149,9 @@ public CompletableFuture<GetJobsResponse> getJobs() {
 	// ----- Endpoint: rollup.get_rollup_caps
 
 	/**
-	 * Get the rollup job capabilities. Get the capabilities of any rollup jobs that
-	 * have been configured for a specific index or index pattern.
-	 * <p>
-	 * This API is useful because a rollup job is often configured to rollup only a
-	 * subset of fields from the source index. Furthermore, only certain
-	 * aggregations can be configured for various fields, leading to a limited
-	 * subset of functionality depending on that configuration. This API enables you
-	 * to inspect an index and determine:
-	 * <ol>
-	 * <li>Does this index have associated rollup data somewhere in the
-	 * cluster?</li>
-	 * <li>If yes to the first question, what fields were rolled up, what
-	 * aggregations can be performed, and where does the data live?</li>
-	 * </ol>
-	 *
+	 * Returns the capabilities of any rollup jobs that have been configured for a
+	 * specific index or index pattern.
+	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-caps.html">Documentation
 	 *      on elastic.co</a>
@@ -251,21 +165,9 @@ public CompletableFuture<GetRollupCapsResponse> getRollupCaps(GetRollupCapsReque
 	}
 
 	/**
-	 * Get the rollup job capabilities. Get the capabilities of any rollup jobs that
-	 * have been configured for a specific index or index pattern.
-	 * <p>
-	 * This API is useful because a rollup job is often configured to rollup only a
-	 * subset of fields from the source index. Furthermore, only certain
-	 * aggregations can be configured for various fields, leading to a limited
-	 * subset of functionality depending on that configuration. This API enables you
-	 * to inspect an index and determine:
-	 * <ol>
-	 * <li>Does this index have associated rollup data somewhere in the
-	 * cluster?</li>
-	 * <li>If yes to the first question, what fields were rolled up, what
-	 * aggregations can be performed, and where does the data live?</li>
-	 * </ol>
-	 *
+	 * Returns the capabilities of any rollup jobs that have been configured for a
+	 * specific index or index pattern.
+	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
 	 *            {@link GetRollupCapsRequest}
@@ -280,21 +182,9 @@ public final CompletableFuture<GetRollupCapsResponse> getRollupCaps(
 	}
 
 	/**
-	 * Get the rollup job capabilities. Get the capabilities of any rollup jobs that
-	 * have been configured for a specific index or index pattern.
-	 * <p>
-	 * This API is useful because a rollup job is often configured to rollup only a
-	 * subset of fields from the source index. Furthermore, only certain
-	 * aggregations can be configured for various fields, leading to a limited
-	 * subset of functionality depending on that configuration. This API enables you
-	 * to inspect an index and determine:
-	 * <ol>
-	 * <li>Does this index have associated rollup data somewhere in the
-	 * cluster?</li>
-	 * <li>If yes to the first question, what fields were rolled up, what
-	 * aggregations can be performed, and where does the data live?</li>
-	 * </ol>
-	 *
+	 * Returns the capabilities of any rollup jobs that have been configured for a
+	 * specific index or index pattern.
+	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-caps.html">Documentation
 	 *      on elastic.co</a>
@@ -308,17 +198,9 @@ public CompletableFuture<GetRollupCapsResponse> getRollupCaps() {
 	// ----- Endpoint: rollup.get_rollup_index_caps
 
 	/**
-	 * Get the rollup index capabilities. Get the rollup capabilities of all jobs
-	 * inside of a rollup index. A single rollup index may store the data for
-	 * multiple rollup jobs and may have a variety of capabilities depending on
-	 * those jobs. This API enables you to determine:
-	 * <ul>
-	 * <li>What jobs are stored in an index (or indices specified via a
-	 * pattern)?</li>
-	 * <li>What target indices were rolled up, what fields were used in those
-	 * rollups, and what aggregations can be performed on each job?</li>
-	 * </ul>
-	 *
+	 * Returns the rollup capabilities of all jobs inside of a rollup index (for
+	 * example, the index where rollup data is stored).
+	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-index-caps.html">Documentation
 	 *      on elastic.co</a>
@@ -332,17 +214,9 @@ public CompletableFuture<GetRollupIndexCapsResponse> getRollupIndexCaps(GetRollu
 	}
 
 	/**
-	 * Get the rollup index capabilities. Get the rollup capabilities of all jobs
-	 * inside of a rollup index. A single rollup index may store the data for
-	 * multiple rollup jobs and may have a variety of capabilities depending on
-	 * those jobs. This API enables you to determine:
-	 * <ul>
-	 * <li>What jobs are stored in an index (or indices specified via a
-	 * pattern)?</li>
-	 * <li>What target indices were rolled up, what fields were used in those
-	 * rollups, and what aggregations can be performed on each job?</li>
-	 * </ul>
-	 *
+	 * Returns the rollup capabilities of all jobs inside of a rollup index (for
+	 * example, the index where rollup data is stored).
+	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
 	 *            {@link GetRollupIndexCapsRequest}
@@ -359,23 +233,7 @@ public final CompletableFuture<GetRollupIndexCapsResponse> getRollupIndexCaps(
 	// ----- Endpoint: rollup.put_job
 
 	/**
-	 * Create a rollup job.
-	 * <p>
-	 * WARNING: From 8.15.0, calling this API in a cluster with no rollup usage will
-	 * fail with a message about the deprecation and planned removal of rollup
-	 * features. A cluster needs to contain either a rollup job or a rollup index in
-	 * order for this API to be allowed to run.
-	 * <p>
-	 * The rollup job configuration contains all the details about how the job
-	 * should run, when it indexes documents, and what future queries will be able
-	 * to run against the rollup index.
-	 * <p>
-	 * There are three main sections to the job configuration: the logistical
-	 * details about the job (for example, the cron schedule), the fields that are
-	 * used for grouping, and what metrics to collect for each group.
-	 * <p>
-	 * Jobs are created in a <code>STOPPED</code> state. You can start them with the
-	 * start rollup jobs API.
+	 * Creates a rollup job.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-put-job.html">Documentation
@@ -390,23 +248,7 @@ public CompletableFuture<PutJobResponse> putJob(PutJobRequest request) {
 	}
 
 	/**
-	 * Create a rollup job.
-	 * <p>
-	 * WARNING: From 8.15.0, calling this API in a cluster with no rollup usage will
-	 * fail with a message about the deprecation and planned removal of rollup
-	 * features. A cluster needs to contain either a rollup job or a rollup index in
-	 * order for this API to be allowed to run.
-	 * <p>
-	 * The rollup job configuration contains all the details about how the job
-	 * should run, when it indexes documents, and what future queries will be able
-	 * to run against the rollup index.
-	 * <p>
-	 * There are three main sections to the job configuration: the logistical
-	 * details about the job (for example, the cron schedule), the fields that are
-	 * used for grouping, and what metrics to collect for each group.
-	 * <p>
-	 * Jobs are created in a <code>STOPPED</code> state. You can start them with the
-	 * start rollup jobs API.
+	 * Creates a rollup job.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -424,11 +266,7 @@ public final CompletableFuture<PutJobResponse> putJob(
 	// ----- Endpoint: rollup.rollup_search
 
 	/**
-	 * Search rolled-up data. The rollup search endpoint is needed because,
-	 * internally, rolled-up documents utilize a different document structure than
-	 * the original data. It rewrites standard Query DSL into a format that matches
-	 * the rollup documents then takes the response and rewrites it back to what a
-	 * client would expect given the original query.
+	 * Enables searching rolled-up data using the standard Query DSL.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-search.html">Documentation
@@ -447,11 +285,7 @@ public <TDocument> CompletableFuture<RollupSearchResponse<TDocument>> rollupSear
 	}
 
 	/**
-	 * Search rolled-up data. The rollup search endpoint is needed because,
-	 * internally, rolled-up documents utilize a different document structure than
-	 * the original data. It rewrites standard Query DSL into a format that matches
-	 * the rollup documents then takes the response and rewrites it back to what a
-	 * client would expect given the original query.
+	 * Enables searching rolled-up data using the standard Query DSL.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -468,11 +302,7 @@ public final <TDocument> CompletableFuture<RollupSearchResponse<TDocument>> roll
 	}
 
 	/**
-	 * Search rolled-up data. The rollup search endpoint is needed because,
-	 * internally, rolled-up documents utilize a different document structure than
-	 * the original data. It rewrites standard Query DSL into a format that matches
-	 * the rollup documents then takes the response and rewrites it back to what a
-	 * client would expect given the original query.
+	 * Enables searching rolled-up data using the standard Query DSL.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-search.html">Documentation
@@ -491,11 +321,7 @@ public <TDocument> CompletableFuture<RollupSearchResponse<TDocument>> rollupSear
 	}
 
 	/**
-	 * Search rolled-up data. The rollup search endpoint is needed because,
-	 * internally, rolled-up documents utilize a different document structure than
-	 * the original data. It rewrites standard Query DSL into a format that matches
-	 * the rollup documents then takes the response and rewrites it back to what a
-	 * client would expect given the original query.
+	 * Enables searching rolled-up data using the standard Query DSL.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -513,9 +339,7 @@ public final <TDocument> CompletableFuture<RollupSearchResponse<TDocument>> roll
 	// ----- Endpoint: rollup.start_job
 
 	/**
-	 * Start rollup jobs. If you try to start a job that does not exist, an
-	 * exception occurs. If you try to start a job that is already started, nothing
-	 * happens.
+	 * Starts an existing, stopped rollup job.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-start-job.html">Documentation
@@ -530,9 +354,7 @@ public CompletableFuture<StartJobResponse> startJob(StartJobRequest request) {
 	}
 
 	/**
-	 * Start rollup jobs. If you try to start a job that does not exist, an
-	 * exception occurs. If you try to start a job that is already started, nothing
-	 * happens.
+	 * Starts an existing, stopped rollup job.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -550,8 +372,7 @@ public final CompletableFuture<StartJobResponse> startJob(
 	// ----- Endpoint: rollup.stop_job
 
 	/**
-	 * Stop rollup jobs. If you try to stop a job that does not exist, an exception
-	 * occurs. If you try to stop a job that is already stopped, nothing happens.
+	 * Stops an existing, started rollup job.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-stop-job.html">Documentation
@@ -566,8 +387,7 @@ public CompletableFuture<StopJobResponse> stopJob(StopJobRequest request) {
 	}
 
 	/**
-	 * Stop rollup jobs. If you try to stop a job that does not exist, an exception
-	 * occurs. If you try to stop a job that is already stopped, nothing happens.
+	 * Stops an existing, started rollup job.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/ElasticsearchRollupClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/ElasticsearchRollupClient.java
index 021e3f572..f8b4584cc 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/ElasticsearchRollupClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/ElasticsearchRollupClient.java
@@ -70,36 +70,8 @@ public ElasticsearchRollupClient withTransportOptions(@Nullable TransportOptions
 	// ----- Endpoint: rollup.delete_job
 
 	/**
-	 * Delete a rollup job.
-	 * <p>
-	 * A job must be stopped before it can be deleted. If you attempt to delete a
-	 * started job, an error occurs. Similarly, if you attempt to delete a
-	 * nonexistent job, an exception occurs.
-	 * <p>
-	 * IMPORTANT: When you delete a job, you remove only the process that is
-	 * actively monitoring and rolling up data. The API does not delete any
-	 * previously rolled up data. This is by design; a user may wish to roll up a
-	 * static data set. Because the data set is static, after it has been fully
-	 * rolled up there is no need to keep the indexing rollup job around (as there
-	 * will be no new data). Thus the job can be deleted, leaving behind the rolled
-	 * up data for analysis. If you wish to also remove the rollup data and the
-	 * rollup index contains the data for only a single job, you can delete the
-	 * whole rollup index. If the rollup index stores data from several jobs, you
-	 * must issue a delete-by-query that targets the rollup job's identifier in the
-	 * rollup index. For example:
+	 * Deletes an existing rollup job.
 	 * 
-	 * <pre>
-	 * <code>POST my_rollup_index/_delete_by_query
-	 * {
-	 *   &quot;query&quot;: {
-	 *     &quot;term&quot;: {
-	 *       &quot;_rollup.id&quot;: &quot;the_rollup_job_id&quot;
-	 *     }
-	 *   }
-	 * }
-	 * </code>
-	 * </pre>
-	 *
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-delete-job.html">Documentation
 	 *      on elastic.co</a>
@@ -113,36 +85,8 @@ public DeleteJobResponse deleteJob(DeleteJobRequest request) throws IOException,
 	}
 
 	/**
-	 * Delete a rollup job.
-	 * <p>
-	 * A job must be stopped before it can be deleted. If you attempt to delete a
-	 * started job, an error occurs. Similarly, if you attempt to delete a
-	 * nonexistent job, an exception occurs.
-	 * <p>
-	 * IMPORTANT: When you delete a job, you remove only the process that is
-	 * actively monitoring and rolling up data. The API does not delete any
-	 * previously rolled up data. This is by design; a user may wish to roll up a
-	 * static data set. Because the data set is static, after it has been fully
-	 * rolled up there is no need to keep the indexing rollup job around (as there
-	 * will be no new data). Thus the job can be deleted, leaving behind the rolled
-	 * up data for analysis. If you wish to also remove the rollup data and the
-	 * rollup index contains the data for only a single job, you can delete the
-	 * whole rollup index. If the rollup index stores data from several jobs, you
-	 * must issue a delete-by-query that targets the rollup job's identifier in the
-	 * rollup index. For example:
+	 * Deletes an existing rollup job.
 	 * 
-	 * <pre>
-	 * <code>POST my_rollup_index/_delete_by_query
-	 * {
-	 *   &quot;query&quot;: {
-	 *     &quot;term&quot;: {
-	 *       &quot;_rollup.id&quot;: &quot;the_rollup_job_id&quot;
-	 *     }
-	 *   }
-	 * }
-	 * </code>
-	 * </pre>
-	 *
 	 * @param fn
 	 *            a function that initializes a builder to create the
 	 *            {@link DeleteJobRequest}
@@ -159,13 +103,7 @@ public final DeleteJobResponse deleteJob(Function<DeleteJobRequest.Builder, Obje
 	// ----- Endpoint: rollup.get_jobs
 
 	/**
-	 * Get rollup job information. Get the configuration, stats, and status of
-	 * rollup jobs.
-	 * <p>
-	 * NOTE: This API returns only active (both <code>STARTED</code> and
-	 * <code>STOPPED</code>) jobs. If a job was created, ran for a while, then was
-	 * deleted, the API does not return any details about it. For details about a
-	 * historical rollup job, the rollup capabilities API may be more useful.
+	 * Retrieves the configuration, stats, and status of rollup jobs.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-job.html">Documentation
@@ -180,13 +118,7 @@ public GetJobsResponse getJobs(GetJobsRequest request) throws IOException, Elast
 	}
 
 	/**
-	 * Get rollup job information. Get the configuration, stats, and status of
-	 * rollup jobs.
-	 * <p>
-	 * NOTE: This API returns only active (both <code>STARTED</code> and
-	 * <code>STOPPED</code>) jobs. If a job was created, ran for a while, then was
-	 * deleted, the API does not return any details about it. For details about a
-	 * historical rollup job, the rollup capabilities API may be more useful.
+	 * Retrieves the configuration, stats, and status of rollup jobs.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -202,13 +134,7 @@ public final GetJobsResponse getJobs(Function<GetJobsRequest.Builder, ObjectBuil
 	}
 
 	/**
-	 * Get rollup job information. Get the configuration, stats, and status of
-	 * rollup jobs.
-	 * <p>
-	 * NOTE: This API returns only active (both <code>STARTED</code> and
-	 * <code>STOPPED</code>) jobs. If a job was created, ran for a while, then was
-	 * deleted, the API does not return any details about it. For details about a
-	 * historical rollup job, the rollup capabilities API may be more useful.
+	 * Retrieves the configuration, stats, and status of rollup jobs.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-job.html">Documentation
@@ -223,21 +149,9 @@ public GetJobsResponse getJobs() throws IOException, ElasticsearchException {
 	// ----- Endpoint: rollup.get_rollup_caps
 
 	/**
-	 * Get the rollup job capabilities. Get the capabilities of any rollup jobs that
-	 * have been configured for a specific index or index pattern.
-	 * <p>
-	 * This API is useful because a rollup job is often configured to rollup only a
-	 * subset of fields from the source index. Furthermore, only certain
-	 * aggregations can be configured for various fields, leading to a limited
-	 * subset of functionality depending on that configuration. This API enables you
-	 * to inspect an index and determine:
-	 * <ol>
-	 * <li>Does this index have associated rollup data somewhere in the
-	 * cluster?</li>
-	 * <li>If yes to the first question, what fields were rolled up, what
-	 * aggregations can be performed, and where does the data live?</li>
-	 * </ol>
-	 *
+	 * Returns the capabilities of any rollup jobs that have been configured for a
+	 * specific index or index pattern.
+	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-caps.html">Documentation
 	 *      on elastic.co</a>
@@ -252,21 +166,9 @@ public GetRollupCapsResponse getRollupCaps(GetRollupCapsRequest request)
 	}
 
 	/**
-	 * Get the rollup job capabilities. Get the capabilities of any rollup jobs that
-	 * have been configured for a specific index or index pattern.
-	 * <p>
-	 * This API is useful because a rollup job is often configured to rollup only a
-	 * subset of fields from the source index. Furthermore, only certain
-	 * aggregations can be configured for various fields, leading to a limited
-	 * subset of functionality depending on that configuration. This API enables you
-	 * to inspect an index and determine:
-	 * <ol>
-	 * <li>Does this index have associated rollup data somewhere in the
-	 * cluster?</li>
-	 * <li>If yes to the first question, what fields were rolled up, what
-	 * aggregations can be performed, and where does the data live?</li>
-	 * </ol>
-	 *
+	 * Returns the capabilities of any rollup jobs that have been configured for a
+	 * specific index or index pattern.
+	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
 	 *            {@link GetRollupCapsRequest}
@@ -282,21 +184,9 @@ public final GetRollupCapsResponse getRollupCaps(
 	}
 
 	/**
-	 * Get the rollup job capabilities. Get the capabilities of any rollup jobs that
-	 * have been configured for a specific index or index pattern.
-	 * <p>
-	 * This API is useful because a rollup job is often configured to rollup only a
-	 * subset of fields from the source index. Furthermore, only certain
-	 * aggregations can be configured for various fields, leading to a limited
-	 * subset of functionality depending on that configuration. This API enables you
-	 * to inspect an index and determine:
-	 * <ol>
-	 * <li>Does this index have associated rollup data somewhere in the
-	 * cluster?</li>
-	 * <li>If yes to the first question, what fields were rolled up, what
-	 * aggregations can be performed, and where does the data live?</li>
-	 * </ol>
-	 *
+	 * Returns the capabilities of any rollup jobs that have been configured for a
+	 * specific index or index pattern.
+	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-caps.html">Documentation
 	 *      on elastic.co</a>
@@ -310,17 +200,9 @@ public GetRollupCapsResponse getRollupCaps() throws IOException, ElasticsearchEx
 	// ----- Endpoint: rollup.get_rollup_index_caps
 
 	/**
-	 * Get the rollup index capabilities. Get the rollup capabilities of all jobs
-	 * inside of a rollup index. A single rollup index may store the data for
-	 * multiple rollup jobs and may have a variety of capabilities depending on
-	 * those jobs. This API enables you to determine:
-	 * <ul>
-	 * <li>What jobs are stored in an index (or indices specified via a
-	 * pattern)?</li>
-	 * <li>What target indices were rolled up, what fields were used in those
-	 * rollups, and what aggregations can be performed on each job?</li>
-	 * </ul>
-	 *
+	 * Returns the rollup capabilities of all jobs inside of a rollup index (for
+	 * example, the index where rollup data is stored).
+	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-index-caps.html">Documentation
 	 *      on elastic.co</a>
@@ -335,17 +217,9 @@ public GetRollupIndexCapsResponse getRollupIndexCaps(GetRollupIndexCapsRequest r
 	}
 
 	/**
-	 * Get the rollup index capabilities. Get the rollup capabilities of all jobs
-	 * inside of a rollup index. A single rollup index may store the data for
-	 * multiple rollup jobs and may have a variety of capabilities depending on
-	 * those jobs. This API enables you to determine:
-	 * <ul>
-	 * <li>What jobs are stored in an index (or indices specified via a
-	 * pattern)?</li>
-	 * <li>What target indices were rolled up, what fields were used in those
-	 * rollups, and what aggregations can be performed on each job?</li>
-	 * </ul>
-	 *
+	 * Returns the rollup capabilities of all jobs inside of a rollup index (for
+	 * example, the index where rollup data is stored).
+	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
 	 *            {@link GetRollupIndexCapsRequest}
@@ -363,23 +237,7 @@ public final GetRollupIndexCapsResponse getRollupIndexCaps(
 	// ----- Endpoint: rollup.put_job
 
 	/**
-	 * Create a rollup job.
-	 * <p>
-	 * WARNING: From 8.15.0, calling this API in a cluster with no rollup usage will
-	 * fail with a message about the deprecation and planned removal of rollup
-	 * features. A cluster needs to contain either a rollup job or a rollup index in
-	 * order for this API to be allowed to run.
-	 * <p>
-	 * The rollup job configuration contains all the details about how the job
-	 * should run, when it indexes documents, and what future queries will be able
-	 * to run against the rollup index.
-	 * <p>
-	 * There are three main sections to the job configuration: the logistical
-	 * details about the job (for example, the cron schedule), the fields that are
-	 * used for grouping, and what metrics to collect for each group.
-	 * <p>
-	 * Jobs are created in a <code>STOPPED</code> state. You can start them with the
-	 * start rollup jobs API.
+	 * Creates a rollup job.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-put-job.html">Documentation
@@ -394,23 +252,7 @@ public PutJobResponse putJob(PutJobRequest request) throws IOException, Elastics
 	}
 
 	/**
-	 * Create a rollup job.
-	 * <p>
-	 * WARNING: From 8.15.0, calling this API in a cluster with no rollup usage will
-	 * fail with a message about the deprecation and planned removal of rollup
-	 * features. A cluster needs to contain either a rollup job or a rollup index in
-	 * order for this API to be allowed to run.
-	 * <p>
-	 * The rollup job configuration contains all the details about how the job
-	 * should run, when it indexes documents, and what future queries will be able
-	 * to run against the rollup index.
-	 * <p>
-	 * There are three main sections to the job configuration: the logistical
-	 * details about the job (for example, the cron schedule), the fields that are
-	 * used for grouping, and what metrics to collect for each group.
-	 * <p>
-	 * Jobs are created in a <code>STOPPED</code> state. You can start them with the
-	 * start rollup jobs API.
+	 * Creates a rollup job.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -428,11 +270,7 @@ public final PutJobResponse putJob(Function<PutJobRequest.Builder, ObjectBuilder
 	// ----- Endpoint: rollup.rollup_search
 
 	/**
-	 * Search rolled-up data. The rollup search endpoint is needed because,
-	 * internally, rolled-up documents utilize a different document structure than
-	 * the original data. It rewrites standard Query DSL into a format that matches
-	 * the rollup documents then takes the response and rewrites it back to what a
-	 * client would expect given the original query.
+	 * Enables searching rolled-up data using the standard Query DSL.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-search.html">Documentation
@@ -451,11 +289,7 @@ public <TDocument> RollupSearchResponse<TDocument> rollupSearch(RollupSearchRequ
 	}
 
 	/**
-	 * Search rolled-up data. The rollup search endpoint is needed because,
-	 * internally, rolled-up documents utilize a different document structure than
-	 * the original data. It rewrites standard Query DSL into a format that matches
-	 * the rollup documents then takes the response and rewrites it back to what a
-	 * client would expect given the original query.
+	 * Enables searching rolled-up data using the standard Query DSL.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -472,11 +306,7 @@ public final <TDocument> RollupSearchResponse<TDocument> rollupSearch(
 	}
 
 	/**
-	 * Search rolled-up data. The rollup search endpoint is needed because,
-	 * internally, rolled-up documents utilize a different document structure than
-	 * the original data. It rewrites standard Query DSL into a format that matches
-	 * the rollup documents then takes the response and rewrites it back to what a
-	 * client would expect given the original query.
+	 * Enables searching rolled-up data using the standard Query DSL.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-search.html">Documentation
@@ -495,11 +325,7 @@ public <TDocument> RollupSearchResponse<TDocument> rollupSearch(RollupSearchRequ
 	}
 
 	/**
-	 * Search rolled-up data. The rollup search endpoint is needed because,
-	 * internally, rolled-up documents utilize a different document structure than
-	 * the original data. It rewrites standard Query DSL into a format that matches
-	 * the rollup documents then takes the response and rewrites it back to what a
-	 * client would expect given the original query.
+	 * Enables searching rolled-up data using the standard Query DSL.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -518,9 +344,7 @@ public final <TDocument> RollupSearchResponse<TDocument> rollupSearch(
 	// ----- Endpoint: rollup.start_job
 
 	/**
-	 * Start rollup jobs. If you try to start a job that does not exist, an
-	 * exception occurs. If you try to start a job that is already started, nothing
-	 * happens.
+	 * Starts an existing, stopped rollup job.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-start-job.html">Documentation
@@ -535,9 +359,7 @@ public StartJobResponse startJob(StartJobRequest request) throws IOException, El
 	}
 
 	/**
-	 * Start rollup jobs. If you try to start a job that does not exist, an
-	 * exception occurs. If you try to start a job that is already started, nothing
-	 * happens.
+	 * Starts an existing, stopped rollup job.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -555,8 +377,7 @@ public final StartJobResponse startJob(Function<StartJobRequest.Builder, ObjectB
 	// ----- Endpoint: rollup.stop_job
 
 	/**
-	 * Stop rollup jobs. If you try to stop a job that does not exist, an exception
-	 * occurs. If you try to stop a job that is already stopped, nothing happens.
+	 * Stops an existing, started rollup job.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-stop-job.html">Documentation
@@ -571,8 +392,7 @@ public StopJobResponse stopJob(StopJobRequest request) throws IOException, Elast
 	}
 
 	/**
-	 * Stop rollup jobs. If you try to stop a job that does not exist, an exception
-	 * occurs. If you try to stop a job that is already stopped, nothing happens.
+	 * Stops an existing, started rollup job.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetJobsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetJobsRequest.java
index 79ed80012..29f9fe583 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetJobsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetJobsRequest.java
@@ -55,13 +55,7 @@
 // typedef: rollup.get_jobs.Request
 
 /**
- * Get rollup job information. Get the configuration, stats, and status of
- * rollup jobs.
- * <p>
- * NOTE: This API returns only active (both <code>STARTED</code> and
- * <code>STOPPED</code>) jobs. If a job was created, ran for a while, then was
- * deleted, the API does not return any details about it. For details about a
- * historical rollup job, the rollup capabilities API may be more useful.
+ * Retrieves the configuration, stats, and status of rollup jobs.
  * 
  * @see <a href="../doc-files/api-spec.html#rollup.get_jobs.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupCapsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupCapsRequest.java
index 43f2c701d..7f1a32ac5 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupCapsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupCapsRequest.java
@@ -55,21 +55,9 @@
 // typedef: rollup.get_rollup_caps.Request
 
 /**
- * Get the rollup job capabilities. Get the capabilities of any rollup jobs that
- * have been configured for a specific index or index pattern.
- * <p>
- * This API is useful because a rollup job is often configured to rollup only a
- * subset of fields from the source index. Furthermore, only certain
- * aggregations can be configured for various fields, leading to a limited
- * subset of functionality depending on that configuration. This API enables you
- * to inspect an index and determine:
- * <ol>
- * <li>Does this index have associated rollup data somewhere in the
- * cluster?</li>
- * <li>If yes to the first question, what fields were rolled up, what
- * aggregations can be performed, and where does the data live?</li>
- * </ol>
- *
+ * Returns the capabilities of any rollup jobs that have been configured for a
+ * specific index or index pattern.
+ * 
  * @see <a href="../doc-files/api-spec.html#rollup.get_rollup_caps.Request">API
  *      specification</a>
  */
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupIndexCapsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupIndexCapsRequest.java
index 72aef2df2..d4f711672 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupIndexCapsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/GetRollupIndexCapsRequest.java
@@ -58,17 +58,9 @@
 // typedef: rollup.get_rollup_index_caps.Request
 
 /**
- * Get the rollup index capabilities. Get the rollup capabilities of all jobs
- * inside of a rollup index. A single rollup index may store the data for
- * multiple rollup jobs and may have a variety of capabilities depending on
- * those jobs. This API enables you to determine:
- * <ul>
- * <li>What jobs are stored in an index (or indices specified via a
- * pattern)?</li>
- * <li>What target indices were rolled up, what fields were used in those
- * rollups, and what aggregations can be performed on each job?</li>
- * </ul>
- *
+ * Returns the rollup capabilities of all jobs inside of a rollup index (for
+ * example, the index where rollup data is stored).
+ * 
  * @see <a href=
  *      "../doc-files/api-spec.html#rollup.get_rollup_index_caps.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/PutJobRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/PutJobRequest.java
index 5e059d002..f556d0ce9 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/PutJobRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/PutJobRequest.java
@@ -61,23 +61,7 @@
 // typedef: rollup.put_job.Request
 
 /**
- * Create a rollup job.
- * <p>
- * WARNING: From 8.15.0, calling this API in a cluster with no rollup usage will
- * fail with a message about the deprecation and planned removal of rollup
- * features. A cluster needs to contain either a rollup job or a rollup index in
- * order for this API to be allowed to run.
- * <p>
- * The rollup job configuration contains all the details about how the job
- * should run, when it indexes documents, and what future queries will be able
- * to run against the rollup index.
- * <p>
- * There are three main sections to the job configuration: the logistical
- * details about the job (for example, the cron schedule), the fields that are
- * used for grouping, and what metrics to collect for each group.
- * <p>
- * Jobs are created in a <code>STOPPED</code> state. You can start them with the
- * start rollup jobs API.
+ * Creates a rollup job.
  * 
  * @see <a href="../doc-files/api-spec.html#rollup.put_job.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/RollupSearchRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/RollupSearchRequest.java
index 0d9cc55f8..0eab9af1c 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/RollupSearchRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/RollupSearchRequest.java
@@ -63,11 +63,7 @@
 // typedef: rollup.rollup_search.Request
 
 /**
- * Search rolled-up data. The rollup search endpoint is needed because,
- * internally, rolled-up documents utilize a different document structure than
- * the original data. It rewrites standard Query DSL into a format that matches
- * the rollup documents then takes the response and rewrites it back to what a
- * client would expect given the original query.
+ * Enables searching rolled-up data using the standard Query DSL.
  * 
  * @see <a href="../doc-files/api-spec.html#rollup.rollup_search.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/StartJobRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/StartJobRequest.java
index 4d44c46ff..dc63e9189 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/StartJobRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/StartJobRequest.java
@@ -56,9 +56,7 @@
 // typedef: rollup.start_job.Request
 
 /**
- * Start rollup jobs. If you try to start a job that does not exist, an
- * exception occurs. If you try to start a job that is already started, nothing
- * happens.
+ * Starts an existing, stopped rollup job.
  * 
  * @see <a href="../doc-files/api-spec.html#rollup.start_job.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/StopJobRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/StopJobRequest.java
index 8df95af37..08eb7d861 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/StopJobRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/rollup/StopJobRequest.java
@@ -57,8 +57,7 @@
 // typedef: rollup.stop_job.Request
 
 /**
- * Stop rollup jobs. If you try to stop a job that does not exist, an exception
- * occurs. If you try to stop a job that is already stopped, nothing happens.
+ * Stops an existing, started rollup job.
  * 
  * @see <a href="../doc-files/api-spec.html#rollup.stop_job.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/ListResponse.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/ListResponse.java
index 80c24551d..26a914f44 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/ListResponse.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/ListResponse.java
@@ -19,6 +19,7 @@
 
 package co.elastic.clients.elasticsearch.search_application;
 
+import co.elastic.clients.elasticsearch.search_application.list.SearchApplicationListItem;
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
@@ -63,7 +64,7 @@
 public class ListResponse implements JsonpSerializable {
 	private final long count;
 
-	private final List<SearchApplication> results;
+	private final List<SearchApplicationListItem> results;
 
 	// ---------------------------------------------------------------------------------------------
 
@@ -88,7 +89,7 @@ public final long count() {
 	/**
 	 * Required - API name: {@code results}
 	 */
-	public final List<SearchApplication> results() {
+	public final List<SearchApplicationListItem> results() {
 		return this.results;
 	}
 
@@ -109,7 +110,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 		if (ApiTypeHelper.isDefined(this.results)) {
 			generator.writeKey("results");
 			generator.writeStartArray();
-			for (SearchApplication item0 : this.results) {
+			for (SearchApplicationListItem item0 : this.results) {
 				item0.serialize(generator, mapper);
 
 			}
@@ -133,7 +134,7 @@ public String toString() {
 	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<ListResponse> {
 		private Long count;
 
-		private List<SearchApplication> results;
+		private List<SearchApplicationListItem> results;
 
 		/**
 		 * Required - API name: {@code count}
@@ -148,7 +149,7 @@ public final Builder count(long value) {
 		 * <p>
 		 * Adds all elements of <code>list</code> to <code>results</code>.
 		 */
-		public final Builder results(List<SearchApplication> list) {
+		public final Builder results(List<SearchApplicationListItem> list) {
 			this.results = _listAddAll(this.results, list);
 			return this;
 		}
@@ -158,7 +159,7 @@ public final Builder results(List<SearchApplication> list) {
 		 * <p>
 		 * Adds one or more values to <code>results</code>.
 		 */
-		public final Builder results(SearchApplication value, SearchApplication... values) {
+		public final Builder results(SearchApplicationListItem value, SearchApplicationListItem... values) {
 			this.results = _listAdd(this.results, value, values);
 			return this;
 		}
@@ -168,8 +169,9 @@ public final Builder results(SearchApplication value, SearchApplication... value
 		 * <p>
 		 * Adds a value to <code>results</code> using a builder lambda.
 		 */
-		public final Builder results(Function<SearchApplication.Builder, ObjectBuilder<SearchApplication>> fn) {
-			return results(fn.apply(new SearchApplication.Builder()).build());
+		public final Builder results(
+				Function<SearchApplicationListItem.Builder, ObjectBuilder<SearchApplicationListItem>> fn) {
+			return results(fn.apply(new SearchApplicationListItem.Builder()).build());
 		}
 
 		@Override
@@ -201,7 +203,8 @@ public ListResponse build() {
 	protected static void setupListResponseDeserializer(ObjectDeserializer<ListResponse.Builder> op) {
 
 		op.add(Builder::count, JsonpDeserializer.longDeserializer(), "count");
-		op.add(Builder::results, JsonpDeserializer.arrayDeserializer(SearchApplication._DESERIALIZER), "results");
+		op.add(Builder::results, JsonpDeserializer.arrayDeserializer(SearchApplicationListItem._DESERIALIZER),
+				"results");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/PutRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/PutRequest.java
index 100047271..cec4f56f1 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/PutRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/PutRequest.java
@@ -71,7 +71,7 @@ public class PutRequest extends RequestBase implements JsonpSerializable {
 
 	private final String name;
 
-	private final SearchApplicationParameters searchApplication;
+	private final SearchApplication searchApplication;
 
 	// ---------------------------------------------------------------------------------------------
 
@@ -110,7 +110,7 @@ public final String name() {
 	/**
 	 * Required - Request body.
 	 */
-	public final SearchApplicationParameters searchApplication() {
+	public final SearchApplication searchApplication() {
 		return this.searchApplication;
 	}
 
@@ -134,7 +134,7 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
 
 		private String name;
 
-		private SearchApplicationParameters searchApplication;
+		private SearchApplication searchApplication;
 
 		/**
 		 * If <code>true</code>, this request cannot replace or update existing Search
@@ -160,7 +160,7 @@ public final Builder name(String value) {
 		/**
 		 * Required - Request body.
 		 */
-		public final Builder searchApplication(SearchApplicationParameters value) {
+		public final Builder searchApplication(SearchApplication value) {
 			this.searchApplication = value;
 			return this;
 		}
@@ -169,16 +169,15 @@ public final Builder searchApplication(SearchApplicationParameters value) {
 		 * Required - Request body.
 		 */
 		public final Builder searchApplication(
-				Function<SearchApplicationParameters.Builder, ObjectBuilder<SearchApplicationParameters>> fn) {
-			return this.searchApplication(fn.apply(new SearchApplicationParameters.Builder()).build());
+				Function<SearchApplication.Builder, ObjectBuilder<SearchApplication>> fn) {
+			return this.searchApplication(fn.apply(new SearchApplication.Builder()).build());
 		}
 
 		@Override
 		public Builder withJson(JsonParser parser, JsonpMapper mapper) {
 
 			@SuppressWarnings("unchecked")
-			SearchApplicationParameters value = (SearchApplicationParameters) SearchApplicationParameters._DESERIALIZER
-					.deserialize(parser, mapper);
+			SearchApplication value = (SearchApplication) SearchApplication._DESERIALIZER.deserialize(parser, mapper);
 			return this.searchApplication(value);
 		}
 
@@ -203,7 +202,7 @@ public PutRequest build() {
 	public static final JsonpDeserializer<PutRequest> _DESERIALIZER = createPutRequestDeserializer();
 	protected static JsonpDeserializer<PutRequest> createPutRequestDeserializer() {
 
-		JsonpDeserializer<SearchApplicationParameters> valueDeserializer = SearchApplicationParameters._DESERIALIZER;
+		JsonpDeserializer<SearchApplication> valueDeserializer = SearchApplication._DESERIALIZER;
 
 		return JsonpDeserializer.of(valueDeserializer.acceptedEvents(), (parser, mapper, event) -> new Builder()
 				.searchApplication(valueDeserializer.deserialize(parser, mapper, event)).build());
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/SearchApplication.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/SearchApplication.java
index 2ad9829b0..0e34c6ab7 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/SearchApplication.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/SearchApplication.java
@@ -22,6 +22,8 @@
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
+import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -30,6 +32,7 @@
 import jakarta.json.stream.JsonGenerator;
 import java.lang.Long;
 import java.lang.String;
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Nullable;
@@ -58,18 +61,28 @@
  *      specification</a>
  */
 @JsonpDeserializable
-public class SearchApplication extends SearchApplicationParameters {
+public class SearchApplication implements JsonpSerializable {
 	private final String name;
 
+	private final List<String> indices;
+
 	private final long updatedAtMillis;
 
+	@Nullable
+	private final String analyticsCollectionName;
+
+	@Nullable
+	private final SearchApplicationTemplate template;
+
 	// ---------------------------------------------------------------------------------------------
 
 	protected SearchApplication(AbstractBuilder<?> builder) {
-		super(builder);
 
 		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
+		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
 		this.updatedAtMillis = ApiTypeHelper.requireNonNull(builder.updatedAtMillis, this, "updatedAtMillis");
+		this.analyticsCollectionName = builder.analyticsCollectionName;
+		this.template = builder.template;
 
 	}
 
@@ -78,7 +91,7 @@ public static SearchApplication searchApplicationOf(Function<Builder, ObjectBuil
 	}
 
 	/**
-	 * Required - Search Application name
+	 * Required - Search Application name.
 	 * <p>
 	 * API name: {@code name}
 	 */
@@ -86,6 +99,15 @@ public final String name() {
 		return this.name;
 	}
 
+	/**
+	 * Required - Indices that are part of the Search Application.
+	 * <p>
+	 * API name: {@code indices}
+	 */
+	public final List<String> indices() {
+		return this.indices;
+	}
+
 	/**
 	 * Required - Last time the Search Application was updated.
 	 * <p>
@@ -95,15 +117,69 @@ public final long updatedAtMillis() {
 		return this.updatedAtMillis;
 	}
 
+	/**
+	 * Analytics collection associated to the Search Application.
+	 * <p>
+	 * API name: {@code analytics_collection_name}
+	 */
+	@Nullable
+	public final String analyticsCollectionName() {
+		return this.analyticsCollectionName;
+	}
+
+	/**
+	 * Search template to use on search operations.
+	 * <p>
+	 * API name: {@code template}
+	 */
+	@Nullable
+	public final SearchApplicationTemplate template() {
+		return this.template;
+	}
+
+	/**
+	 * Serialize this object to JSON.
+	 */
+	public void serialize(JsonGenerator generator, JsonpMapper mapper) {
+		generator.writeStartObject();
+		serializeInternal(generator, mapper);
+		generator.writeEnd();
+	}
+
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
-		super.serializeInternal(generator, mapper);
 		generator.writeKey("name");
 		generator.write(this.name);
 
+		if (ApiTypeHelper.isDefined(this.indices)) {
+			generator.writeKey("indices");
+			generator.writeStartArray();
+			for (String item0 : this.indices) {
+				generator.write(item0);
+
+			}
+			generator.writeEnd();
+
+		}
 		generator.writeKey("updated_at_millis");
 		generator.write(this.updatedAtMillis);
 
+		if (this.analyticsCollectionName != null) {
+			generator.writeKey("analytics_collection_name");
+			generator.write(this.analyticsCollectionName);
+
+		}
+		if (this.template != null) {
+			generator.writeKey("template");
+			this.template.serialize(generator, mapper);
+
+		}
+
+	}
+
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
 	}
 
 	// ---------------------------------------------------------------------------------------------
@@ -135,13 +211,21 @@ public SearchApplication build() {
 
 	public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
 			extends
-				SearchApplicationParameters.AbstractBuilder<BuilderT> {
+				WithJsonObjectBuilderBase<BuilderT> {
 		private String name;
 
+		private List<String> indices;
+
 		private Long updatedAtMillis;
 
+		@Nullable
+		private String analyticsCollectionName;
+
+		@Nullable
+		private SearchApplicationTemplate template;
+
 		/**
-		 * Required - Search Application name
+		 * Required - Search Application name.
 		 * <p>
 		 * API name: {@code name}
 		 */
@@ -150,6 +234,30 @@ public final BuilderT name(String value) {
 			return self();
 		}
 
+		/**
+		 * Required - Indices that are part of the Search Application.
+		 * <p>
+		 * API name: {@code indices}
+		 * <p>
+		 * Adds all elements of <code>list</code> to <code>indices</code>.
+		 */
+		public final BuilderT indices(List<String> list) {
+			this.indices = _listAddAll(this.indices, list);
+			return self();
+		}
+
+		/**
+		 * Required - Indices that are part of the Search Application.
+		 * <p>
+		 * API name: {@code indices}
+		 * <p>
+		 * Adds one or more values to <code>indices</code>.
+		 */
+		public final BuilderT indices(String value, String... values) {
+			this.indices = _listAdd(this.indices, value, values);
+			return self();
+		}
+
 		/**
 		 * Required - Last time the Search Application was updated.
 		 * <p>
@@ -160,6 +268,38 @@ public final BuilderT updatedAtMillis(long value) {
 			return self();
 		}
 
+		/**
+		 * Analytics collection associated to the Search Application.
+		 * <p>
+		 * API name: {@code analytics_collection_name}
+		 */
+		public final BuilderT analyticsCollectionName(@Nullable String value) {
+			this.analyticsCollectionName = value;
+			return self();
+		}
+
+		/**
+		 * Search template to use on search operations.
+		 * <p>
+		 * API name: {@code template}
+		 */
+		public final BuilderT template(@Nullable SearchApplicationTemplate value) {
+			this.template = value;
+			return self();
+		}
+
+		/**
+		 * Search template to use on search operations.
+		 * <p>
+		 * API name: {@code template}
+		 */
+		public final BuilderT template(
+				Function<SearchApplicationTemplate.Builder, ObjectBuilder<SearchApplicationTemplate>> fn) {
+			return this.template(fn.apply(new SearchApplicationTemplate.Builder()).build());
+		}
+
+		protected abstract BuilderT self();
+
 	}
 
 	// ---------------------------------------------------------------------------------------------
@@ -172,9 +312,14 @@ public final BuilderT updatedAtMillis(long value) {
 
 	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSearchApplicationDeserializer(
 			ObjectDeserializer<BuilderT> op) {
-		SearchApplicationParameters.setupSearchApplicationParametersDeserializer(op);
+
 		op.add(AbstractBuilder::name, JsonpDeserializer.stringDeserializer(), "name");
+		op.add(AbstractBuilder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+				"indices");
 		op.add(AbstractBuilder::updatedAtMillis, JsonpDeserializer.longDeserializer(), "updated_at_millis");
+		op.add(AbstractBuilder::analyticsCollectionName, JsonpDeserializer.stringDeserializer(),
+				"analytics_collection_name");
+		op.add(AbstractBuilder::template, SearchApplicationTemplate._DESERIALIZER, "template");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/SearchApplicationParameters.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/list/SearchApplicationListItem.java
similarity index 58%
rename from java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/SearchApplicationParameters.java
rename to java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/list/SearchApplicationListItem.java
index f8d57a04a..c75be3999 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/SearchApplicationParameters.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/search_application/list/SearchApplicationListItem.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package co.elastic.clients.elasticsearch.search_application;
+package co.elastic.clients.elasticsearch.search_application.list;
 
 import co.elastic.clients.json.JsonpDeserializable;
 import co.elastic.clients.json.JsonpDeserializer;
@@ -30,6 +30,7 @@
 import co.elastic.clients.util.ObjectBuilder;
 import co.elastic.clients.util.WithJsonObjectBuilderBase;
 import jakarta.json.stream.JsonGenerator;
+import java.lang.Long;
 import java.lang.String;
 import java.util.List;
 import java.util.Objects;
@@ -51,41 +52,51 @@
 //
 //----------------------------------------------------------------
 
-// typedef: search_application._types.SearchApplicationParameters
+// typedef: search_application.list.SearchApplicationListItem
 
 /**
  *
  * @see <a href=
- *      "../doc-files/api-spec.html#search_application._types.SearchApplicationParameters">API
+ *      "../../doc-files/api-spec.html#search_application.list.SearchApplicationListItem">API
  *      specification</a>
  */
 @JsonpDeserializable
-public class SearchApplicationParameters implements JsonpSerializable {
+public class SearchApplicationListItem implements JsonpSerializable {
+	private final String name;
+
 	private final List<String> indices;
 
-	@Nullable
-	private final String analyticsCollectionName;
+	private final long updatedAtMillis;
 
 	@Nullable
-	private final SearchApplicationTemplate template;
+	private final String analyticsCollectionName;
 
 	// ---------------------------------------------------------------------------------------------
 
-	protected SearchApplicationParameters(AbstractBuilder<?> builder) {
+	private SearchApplicationListItem(Builder builder) {
 
+		this.name = ApiTypeHelper.requireNonNull(builder.name, this, "name");
 		this.indices = ApiTypeHelper.unmodifiableRequired(builder.indices, this, "indices");
+		this.updatedAtMillis = ApiTypeHelper.requireNonNull(builder.updatedAtMillis, this, "updatedAtMillis");
 		this.analyticsCollectionName = builder.analyticsCollectionName;
-		this.template = builder.template;
 
 	}
 
-	public static SearchApplicationParameters searchApplicationParametersOf(
-			Function<Builder, ObjectBuilder<SearchApplicationParameters>> fn) {
+	public static SearchApplicationListItem of(Function<Builder, ObjectBuilder<SearchApplicationListItem>> fn) {
 		return fn.apply(new Builder()).build();
 	}
 
 	/**
-	 * Required - Indices that are part of the Search Application.
+	 * Required - Search Application name
+	 * <p>
+	 * API name: {@code name}
+	 */
+	public final String name() {
+		return this.name;
+	}
+
+	/**
+	 * Required - Indices that are part of the Search Application
 	 * <p>
 	 * API name: {@code indices}
 	 */
@@ -94,23 +105,22 @@ public final List<String> indices() {
 	}
 
 	/**
-	 * Analytics collection associated to the Search Application.
+	 * Required - Last time the Search Application was updated
 	 * <p>
-	 * API name: {@code analytics_collection_name}
+	 * API name: {@code updated_at_millis}
 	 */
-	@Nullable
-	public final String analyticsCollectionName() {
-		return this.analyticsCollectionName;
+	public final long updatedAtMillis() {
+		return this.updatedAtMillis;
 	}
 
 	/**
-	 * Search template to use on search operations.
+	 * Analytics collection associated to the Search Application
 	 * <p>
-	 * API name: {@code template}
+	 * API name: {@code analytics_collection_name}
 	 */
 	@Nullable
-	public final SearchApplicationTemplate template() {
-		return this.template;
+	public final String analyticsCollectionName() {
+		return this.analyticsCollectionName;
 	}
 
 	/**
@@ -124,6 +134,9 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
+		generator.writeKey("name");
+		generator.write(this.name);
+
 		if (ApiTypeHelper.isDefined(this.indices)) {
 			generator.writeKey("indices");
 			generator.writeStartArray();
@@ -134,16 +147,14 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			generator.writeEnd();
 
 		}
+		generator.writeKey("updated_at_millis");
+		generator.write(this.updatedAtMillis);
+
 		if (this.analyticsCollectionName != null) {
 			generator.writeKey("analytics_collection_name");
 			generator.write(this.analyticsCollectionName);
 
 		}
-		if (this.template != null) {
-			generator.writeKey("template");
-			this.template.serialize(generator, mapper);
-
-		}
 
 	}
 
@@ -155,115 +166,109 @@ public String toString() {
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Builder for {@link SearchApplicationParameters}.
+	 * Builder for {@link SearchApplicationListItem}.
 	 */
 
-	public static class Builder extends SearchApplicationParameters.AbstractBuilder<Builder>
+	public static class Builder extends WithJsonObjectBuilderBase<Builder>
 			implements
-				ObjectBuilder<SearchApplicationParameters> {
-		@Override
-		protected Builder self() {
-			return this;
-		}
-
-		/**
-		 * Builds a {@link SearchApplicationParameters}.
-		 *
-		 * @throws NullPointerException
-		 *             if some of the required fields are null.
-		 */
-		public SearchApplicationParameters build() {
-			_checkSingleUse();
+				ObjectBuilder<SearchApplicationListItem> {
+		private String name;
 
-			return new SearchApplicationParameters(this);
-		}
-	}
-
-	public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<BuilderT>>
-			extends
-				WithJsonObjectBuilderBase<BuilderT> {
 		private List<String> indices;
 
+		private Long updatedAtMillis;
+
 		@Nullable
 		private String analyticsCollectionName;
 
-		@Nullable
-		private SearchApplicationTemplate template;
+		/**
+		 * Required - Search Application name
+		 * <p>
+		 * API name: {@code name}
+		 */
+		public final Builder name(String value) {
+			this.name = value;
+			return this;
+		}
 
 		/**
-		 * Required - Indices that are part of the Search Application.
+		 * Required - Indices that are part of the Search Application
 		 * <p>
 		 * API name: {@code indices}
 		 * <p>
 		 * Adds all elements of <code>list</code> to <code>indices</code>.
 		 */
-		public final BuilderT indices(List<String> list) {
+		public final Builder indices(List<String> list) {
 			this.indices = _listAddAll(this.indices, list);
-			return self();
+			return this;
 		}
 
 		/**
-		 * Required - Indices that are part of the Search Application.
+		 * Required - Indices that are part of the Search Application
 		 * <p>
 		 * API name: {@code indices}
 		 * <p>
 		 * Adds one or more values to <code>indices</code>.
 		 */
-		public final BuilderT indices(String value, String... values) {
+		public final Builder indices(String value, String... values) {
 			this.indices = _listAdd(this.indices, value, values);
-			return self();
+			return this;
 		}
 
 		/**
-		 * Analytics collection associated to the Search Application.
+		 * Required - Last time the Search Application was updated
 		 * <p>
-		 * API name: {@code analytics_collection_name}
+		 * API name: {@code updated_at_millis}
 		 */
-		public final BuilderT analyticsCollectionName(@Nullable String value) {
-			this.analyticsCollectionName = value;
-			return self();
+		public final Builder updatedAtMillis(long value) {
+			this.updatedAtMillis = value;
+			return this;
 		}
 
 		/**
-		 * Search template to use on search operations.
+		 * Analytics collection associated to the Search Application
 		 * <p>
-		 * API name: {@code template}
+		 * API name: {@code analytics_collection_name}
 		 */
-		public final BuilderT template(@Nullable SearchApplicationTemplate value) {
-			this.template = value;
-			return self();
+		public final Builder analyticsCollectionName(@Nullable String value) {
+			this.analyticsCollectionName = value;
+			return this;
 		}
 
-		/**
-		 * Search template to use on search operations.
-		 * <p>
-		 * API name: {@code template}
-		 */
-		public final BuilderT template(
-				Function<SearchApplicationTemplate.Builder, ObjectBuilder<SearchApplicationTemplate>> fn) {
-			return this.template(fn.apply(new SearchApplicationTemplate.Builder()).build());
+		@Override
+		protected Builder self() {
+			return this;
 		}
 
-		protected abstract BuilderT self();
+		/**
+		 * Builds a {@link SearchApplicationListItem}.
+		 *
+		 * @throws NullPointerException
+		 *             if some of the required fields are null.
+		 */
+		public SearchApplicationListItem build() {
+			_checkSingleUse();
 
+			return new SearchApplicationListItem(this);
+		}
 	}
 
 	// ---------------------------------------------------------------------------------------------
 
 	/**
-	 * Json deserializer for {@link SearchApplicationParameters}
+	 * Json deserializer for {@link SearchApplicationListItem}
 	 */
-	public static final JsonpDeserializer<SearchApplicationParameters> _DESERIALIZER = ObjectBuilderDeserializer
-			.lazy(Builder::new, SearchApplicationParameters::setupSearchApplicationParametersDeserializer);
+	public static final JsonpDeserializer<SearchApplicationListItem> _DESERIALIZER = ObjectBuilderDeserializer
+			.lazy(Builder::new, SearchApplicationListItem::setupSearchApplicationListItemDeserializer);
 
-	protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupSearchApplicationParametersDeserializer(
-			ObjectDeserializer<BuilderT> op) {
+	protected static void setupSearchApplicationListItemDeserializer(
+			ObjectDeserializer<SearchApplicationListItem.Builder> op) {
 
-		op.add(AbstractBuilder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
+		op.add(Builder::name, JsonpDeserializer.stringDeserializer(), "name");
+		op.add(Builder::indices, JsonpDeserializer.arrayDeserializer(JsonpDeserializer.stringDeserializer()),
 				"indices");
-		op.add(AbstractBuilder::analyticsCollectionName, JsonpDeserializer.stringDeserializer(),
-				"analytics_collection_name");
-		op.add(AbstractBuilder::template, SearchApplicationTemplate._DESERIALIZER, "template");
+		op.add(Builder::updatedAtMillis, JsonpDeserializer.longDeserializer(), "updated_at_millis");
+		op.add(Builder::analyticsCollectionName, JsonpDeserializer.stringDeserializer(), "analytics_collection_name");
 
 	}
 
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/CacheStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/CacheStatsRequest.java
index 0d8d16b7c..c807e9642 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/CacheStatsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/CacheStatsRequest.java
@@ -58,8 +58,7 @@
 // typedef: searchable_snapshots.cache_stats.Request
 
 /**
- * Get cache statistics. Get statistics about the shared cache for partially
- * mounted indices.
+ * Retrieve node-level cache statistics about searchable snapshots.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#searchable_snapshots.cache_stats.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ClearCacheRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ClearCacheRequest.java
index d5362ffb4..771e420e7 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ClearCacheRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ClearCacheRequest.java
@@ -59,8 +59,7 @@
 // typedef: searchable_snapshots.clear_cache.Request
 
 /**
- * Clear the cache. Clear indices and data streams from the shared cache for
- * partially mounted indices.
+ * Clear the cache of searchable snapshots.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#searchable_snapshots.clear_cache.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ElasticsearchSearchableSnapshotsAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ElasticsearchSearchableSnapshotsAsyncClient.java
index 338f1d307..175f5f222 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ElasticsearchSearchableSnapshotsAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ElasticsearchSearchableSnapshotsAsyncClient.java
@@ -71,8 +71,7 @@ public ElasticsearchSearchableSnapshotsAsyncClient withTransportOptions(
 	// ----- Endpoint: searchable_snapshots.cache_stats
 
 	/**
-	 * Get cache statistics. Get statistics about the shared cache for partially
-	 * mounted indices.
+	 * Retrieve node-level cache statistics about searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -87,8 +86,7 @@ public CompletableFuture<CacheStatsResponse> cacheStats(CacheStatsRequest reques
 	}
 
 	/**
-	 * Get cache statistics. Get statistics about the shared cache for partially
-	 * mounted indices.
+	 * Retrieve node-level cache statistics about searchable snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -104,8 +102,7 @@ public final CompletableFuture<CacheStatsResponse> cacheStats(
 	}
 
 	/**
-	 * Get cache statistics. Get statistics about the shared cache for partially
-	 * mounted indices.
+	 * Retrieve node-level cache statistics about searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -120,8 +117,7 @@ public CompletableFuture<CacheStatsResponse> cacheStats() {
 	// ----- Endpoint: searchable_snapshots.clear_cache
 
 	/**
-	 * Clear the cache. Clear indices and data streams from the shared cache for
-	 * partially mounted indices.
+	 * Clear the cache of searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -136,8 +132,7 @@ public CompletableFuture<ClearCacheResponse> clearCache(ClearCacheRequest reques
 	}
 
 	/**
-	 * Clear the cache. Clear indices and data streams from the shared cache for
-	 * partially mounted indices.
+	 * Clear the cache of searchable snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -153,8 +148,7 @@ public final CompletableFuture<ClearCacheResponse> clearCache(
 	}
 
 	/**
-	 * Clear the cache. Clear indices and data streams from the shared cache for
-	 * partially mounted indices.
+	 * Clear the cache of searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -169,9 +163,7 @@ public CompletableFuture<ClearCacheResponse> clearCache() {
 	// ----- Endpoint: searchable_snapshots.mount
 
 	/**
-	 * Mount a snapshot. Mount a snapshot as a searchable snapshot index. Do not use
-	 * this API for snapshots managed by index lifecycle management (ILM). Manually
-	 * mounting ILM-managed snapshots can interfere with ILM processes.
+	 * Mount a snapshot as a searchable index.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-api-mount-snapshot.html">Documentation
@@ -186,9 +178,7 @@ public CompletableFuture<MountResponse> mount(MountRequest request) {
 	}
 
 	/**
-	 * Mount a snapshot. Mount a snapshot as a searchable snapshot index. Do not use
-	 * this API for snapshots managed by index lifecycle management (ILM). Manually
-	 * mounting ILM-managed snapshots can interfere with ILM processes.
+	 * Mount a snapshot as a searchable index.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -206,7 +196,7 @@ public final CompletableFuture<MountResponse> mount(
 	// ----- Endpoint: searchable_snapshots.stats
 
 	/**
-	 * Get searchable snapshot statistics.
+	 * Retrieve shard-level statistics about searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -221,7 +211,7 @@ public CompletableFuture<SearchableSnapshotsStatsResponse> stats(SearchableSnaps
 	}
 
 	/**
-	 * Get searchable snapshot statistics.
+	 * Retrieve shard-level statistics about searchable snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -237,7 +227,7 @@ public final CompletableFuture<SearchableSnapshotsStatsResponse> stats(
 	}
 
 	/**
-	 * Get searchable snapshot statistics.
+	 * Retrieve shard-level statistics about searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ElasticsearchSearchableSnapshotsClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ElasticsearchSearchableSnapshotsClient.java
index 6f57e841e..3280a28f0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ElasticsearchSearchableSnapshotsClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/ElasticsearchSearchableSnapshotsClient.java
@@ -71,8 +71,7 @@ public ElasticsearchSearchableSnapshotsClient withTransportOptions(@Nullable Tra
 	// ----- Endpoint: searchable_snapshots.cache_stats
 
 	/**
-	 * Get cache statistics. Get statistics about the shared cache for partially
-	 * mounted indices.
+	 * Retrieve node-level cache statistics about searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -87,8 +86,7 @@ public CacheStatsResponse cacheStats(CacheStatsRequest request) throws IOExcepti
 	}
 
 	/**
-	 * Get cache statistics. Get statistics about the shared cache for partially
-	 * mounted indices.
+	 * Retrieve node-level cache statistics about searchable snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -104,8 +102,7 @@ public final CacheStatsResponse cacheStats(Function<CacheStatsRequest.Builder, O
 	}
 
 	/**
-	 * Get cache statistics. Get statistics about the shared cache for partially
-	 * mounted indices.
+	 * Retrieve node-level cache statistics about searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -120,8 +117,7 @@ public CacheStatsResponse cacheStats() throws IOException, ElasticsearchExceptio
 	// ----- Endpoint: searchable_snapshots.clear_cache
 
 	/**
-	 * Clear the cache. Clear indices and data streams from the shared cache for
-	 * partially mounted indices.
+	 * Clear the cache of searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -136,8 +132,7 @@ public ClearCacheResponse clearCache(ClearCacheRequest request) throws IOExcepti
 	}
 
 	/**
-	 * Clear the cache. Clear indices and data streams from the shared cache for
-	 * partially mounted indices.
+	 * Clear the cache of searchable snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -153,8 +148,7 @@ public final ClearCacheResponse clearCache(Function<ClearCacheRequest.Builder, O
 	}
 
 	/**
-	 * Clear the cache. Clear indices and data streams from the shared cache for
-	 * partially mounted indices.
+	 * Clear the cache of searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -169,9 +163,7 @@ public ClearCacheResponse clearCache() throws IOException, ElasticsearchExceptio
 	// ----- Endpoint: searchable_snapshots.mount
 
 	/**
-	 * Mount a snapshot. Mount a snapshot as a searchable snapshot index. Do not use
-	 * this API for snapshots managed by index lifecycle management (ILM). Manually
-	 * mounting ILM-managed snapshots can interfere with ILM processes.
+	 * Mount a snapshot as a searchable index.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-api-mount-snapshot.html">Documentation
@@ -186,9 +178,7 @@ public MountResponse mount(MountRequest request) throws IOException, Elasticsear
 	}
 
 	/**
-	 * Mount a snapshot. Mount a snapshot as a searchable snapshot index. Do not use
-	 * this API for snapshots managed by index lifecycle management (ILM). Manually
-	 * mounting ILM-managed snapshots can interfere with ILM processes.
+	 * Mount a snapshot as a searchable index.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -206,7 +196,7 @@ public final MountResponse mount(Function<MountRequest.Builder, ObjectBuilder<Mo
 	// ----- Endpoint: searchable_snapshots.stats
 
 	/**
-	 * Get searchable snapshot statistics.
+	 * Retrieve shard-level statistics about searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
@@ -222,7 +212,7 @@ public SearchableSnapshotsStatsResponse stats(SearchableSnapshotsStatsRequest re
 	}
 
 	/**
-	 * Get searchable snapshot statistics.
+	 * Retrieve shard-level statistics about searchable snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -239,7 +229,7 @@ public final SearchableSnapshotsStatsResponse stats(
 	}
 
 	/**
-	 * Get searchable snapshot statistics.
+	 * Retrieve shard-level statistics about searchable snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/MountRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/MountRequest.java
index 1cd7ce354..aa2964a80 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/MountRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/MountRequest.java
@@ -61,9 +61,7 @@
 // typedef: searchable_snapshots.mount.Request
 
 /**
- * Mount a snapshot. Mount a snapshot as a searchable snapshot index. Do not use
- * this API for snapshots managed by index lifecycle management (ILM). Manually
- * mounting ILM-managed snapshots can interfere with ILM processes.
+ * Mount a snapshot as a searchable index.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#searchable_snapshots.mount.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/SearchableSnapshotsStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/SearchableSnapshotsStatsRequest.java
index 7b37b9e90..33630a60d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/SearchableSnapshotsStatsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/searchable_snapshots/SearchableSnapshotsStatsRequest.java
@@ -57,7 +57,7 @@
 // typedef: searchable_snapshots.stats.Request
 
 /**
- * Get searchable snapshot statistics.
+ * Retrieve shard-level statistics about searchable snapshots.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#searchable_snapshots.stats.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ElasticsearchSecurityAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ElasticsearchSecurityAsyncClient.java
index b7345b790..82e2b73e3 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ElasticsearchSecurityAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ElasticsearchSecurityAsyncClient.java
@@ -1140,7 +1140,9 @@ public CompletableFuture<GetPrivilegesResponse> getPrivileges() {
 	/**
 	 * Get roles.
 	 * <p>
-	 * Get roles in the native realm.
+	 * Get roles in the native realm. The role management APIs are generally the
+	 * preferred way to manage roles, rather than using file-based role management.
+	 * The get roles API cannot retrieve roles that are defined in roles files.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role.html">Documentation
@@ -1157,7 +1159,9 @@ public CompletableFuture<GetRoleResponse> getRole(GetRoleRequest request) {
 	/**
 	 * Get roles.
 	 * <p>
-	 * Get roles in the native realm.
+	 * Get roles in the native realm. The role management APIs are generally the
+	 * preferred way to manage roles, rather than using file-based role management.
+	 * The get roles API cannot retrieve roles that are defined in roles files.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1175,7 +1179,9 @@ public final CompletableFuture<GetRoleResponse> getRole(
 	/**
 	 * Get roles.
 	 * <p>
-	 * Get roles in the native realm.
+	 * Get roles in the native realm. The role management APIs are generally the
+	 * preferred way to manage roles, rather than using file-based role management.
+	 * The get roles API cannot retrieve roles that are defined in roles files.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ElasticsearchSecurityClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ElasticsearchSecurityClient.java
index c15eedd89..ae97689ae 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ElasticsearchSecurityClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/ElasticsearchSecurityClient.java
@@ -1170,7 +1170,9 @@ public GetPrivilegesResponse getPrivileges() throws IOException, ElasticsearchEx
 	/**
 	 * Get roles.
 	 * <p>
-	 * Get roles in the native realm.
+	 * Get roles in the native realm. The role management APIs are generally the
+	 * preferred way to manage roles, rather than using file-based role management.
+	 * The get roles API cannot retrieve roles that are defined in roles files.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role.html">Documentation
@@ -1187,7 +1189,9 @@ public GetRoleResponse getRole(GetRoleRequest request) throws IOException, Elast
 	/**
 	 * Get roles.
 	 * <p>
-	 * Get roles in the native realm.
+	 * Get roles in the native realm. The role management APIs are generally the
+	 * preferred way to manage roles, rather than using file-based role management.
+	 * The get roles API cannot retrieve roles that are defined in roles files.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -1205,7 +1209,9 @@ public final GetRoleResponse getRole(Function<GetRoleRequest.Builder, ObjectBuil
 	/**
 	 * Get roles.
 	 * <p>
-	 * Get roles in the native realm.
+	 * Get roles in the native realm. The role management APIs are generally the
+	 * preferred way to manage roles, rather than using file-based role management.
+	 * The get roles API cannot retrieve roles that are defined in roles files.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-get-role.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleRequest.java
index 96243ac01..aecf52d33 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/GetRoleRequest.java
@@ -60,7 +60,9 @@
 /**
  * Get roles.
  * <p>
- * Get roles in the native realm.
+ * Get roles in the native realm. The role management APIs are generally the
+ * preferred way to manage roles, rather than using file-based role management.
+ * The get roles API cannot retrieve roles that are defined in roles files.
  * 
  * @see <a href="../doc-files/api-spec.html#security.get_role.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/PutRoleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/PutRoleRequest.java
index 59d1df3c5..6878b7af0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/PutRoleRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/PutRoleRequest.java
@@ -181,11 +181,7 @@ public final Map<String, JsonData> metadata() {
 	}
 
 	/**
-	 * Required - The name of the role that is being created or updated. On
-	 * Elasticsearch Serverless, the role name must begin with a letter or digit and
-	 * can only contain letters, digits and the characters '_', '-', and '.'. Each
-	 * role must have a unique name, as this will serve as the identifier for that
-	 * role.
+	 * Required - The name of the role.
 	 * <p>
 	 * API name: {@code name}
 	 */
@@ -566,11 +562,7 @@ public final Builder metadata(String key, JsonData value) {
 		}
 
 		/**
-		 * Required - The name of the role that is being created or updated. On
-		 * Elasticsearch Serverless, the role name must begin with a letter or digit and
-		 * can only contain letters, digits and the characters '_', '-', and '.'. Each
-		 * role must have a unique name, as this will serve as the identifier for that
-		 * role.
+		 * Required - The name of the role.
 		 * <p>
 		 * API name: {@code name}
 		 */
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/DeleteNodeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/DeleteNodeRequest.java
index 33686353f..cadea1b06 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/DeleteNodeRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/DeleteNodeRequest.java
@@ -56,17 +56,8 @@
 // typedef: shutdown.delete_node.Request
 
 /**
- * Cancel node shutdown preparations. Remove a node from the shutdown list so it
- * can resume normal operations. You must explicitly clear the shutdown request
- * when a node rejoins the cluster or when a node has permanently left the
- * cluster. Shutdown requests are never removed automatically by Elasticsearch.
- * <p>
- * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
- * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
- * supported.
- * <p>
- * If the operator privileges feature is enabled, you must be an operator to use
- * this API.
+ * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+ * and ECK. Direct use is not supported.
  * 
  * @see <a href="../doc-files/api-spec.html#shutdown.delete_node.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/ElasticsearchShutdownAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/ElasticsearchShutdownAsyncClient.java
index c9c33f601..e32836ca0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/ElasticsearchShutdownAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/ElasticsearchShutdownAsyncClient.java
@@ -70,17 +70,8 @@ public ElasticsearchShutdownAsyncClient withTransportOptions(@Nullable Transport
 	// ----- Endpoint: shutdown.delete_node
 
 	/**
-	 * Cancel node shutdown preparations. Remove a node from the shutdown list so it
-	 * can resume normal operations. You must explicitly clear the shutdown request
-	 * when a node rejoins the cluster or when a node has permanently left the
-	 * cluster. Shutdown requests are never removed automatically by Elasticsearch.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
-	 * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
-	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
+	 * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+	 * and ECK. Direct use is not supported.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current">Documentation
@@ -95,17 +86,8 @@ public CompletableFuture<DeleteNodeResponse> deleteNode(DeleteNodeRequest reques
 	}
 
 	/**
-	 * Cancel node shutdown preparations. Remove a node from the shutdown list so it
-	 * can resume normal operations. You must explicitly clear the shutdown request
-	 * when a node rejoins the cluster or when a node has permanently left the
-	 * cluster. Shutdown requests are never removed automatically by Elasticsearch.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
-	 * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
-	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
+	 * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+	 * and ECK. Direct use is not supported.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -123,18 +105,9 @@ public final CompletableFuture<DeleteNodeResponse> deleteNode(
 	// ----- Endpoint: shutdown.get_node
 
 	/**
-	 * Get the shutdown status.
-	 * <p>
-	 * Get information about nodes that are ready to be shut down, have shut down
-	 * preparations still in progress, or have stalled. The API returns status
-	 * information for each part of the shut down process.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elasticsearch Service,
-	 * Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
+	 * Retrieve status of a node or nodes that are currently marked as shutting
+	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
 	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current">Documentation
@@ -149,18 +122,9 @@ public CompletableFuture<GetNodeResponse> getNode(GetNodeRequest request) {
 	}
 
 	/**
-	 * Get the shutdown status.
-	 * <p>
-	 * Get information about nodes that are ready to be shut down, have shut down
-	 * preparations still in progress, or have stalled. The API returns status
-	 * information for each part of the shut down process.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elasticsearch Service,
-	 * Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
+	 * Retrieve status of a node or nodes that are currently marked as shutting
+	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
 	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -176,18 +140,9 @@ public final CompletableFuture<GetNodeResponse> getNode(
 	}
 
 	/**
-	 * Get the shutdown status.
-	 * <p>
-	 * Get information about nodes that are ready to be shut down, have shut down
-	 * preparations still in progress, or have stalled. The API returns status
-	 * information for each part of the shut down process.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elasticsearch Service,
-	 * Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
+	 * Retrieve status of a node or nodes that are currently marked as shutting
+	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
 	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current">Documentation
@@ -202,26 +157,8 @@ public CompletableFuture<GetNodeResponse> getNode() {
 	// ----- Endpoint: shutdown.put_node
 
 	/**
-	 * Prepare a node to be shut down.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
-	 * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
-	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
-	 * <p>
-	 * The API migrates ongoing tasks and index shards to other nodes as needed to
-	 * prepare a node to be restarted or shut down and removed from the cluster.
-	 * This ensures that Elasticsearch can be stopped safely with minimal disruption
-	 * to the cluster.
-	 * <p>
-	 * You must specify the type of shutdown: <code>restart</code>,
-	 * <code>remove</code>, or <code>replace</code>. If a node is already being
-	 * prepared for shutdown, you can use this API to change the shutdown type.
-	 * <p>
-	 * IMPORTANT: This API does NOT terminate the Elasticsearch process. Monitor the
-	 * node shutdown status to determine when it is safe to stop Elasticsearch.
+	 * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+	 * Direct use is not supported.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current">Documentation
@@ -236,26 +173,8 @@ public CompletableFuture<PutNodeResponse> putNode(PutNodeRequest request) {
 	}
 
 	/**
-	 * Prepare a node to be shut down.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
-	 * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
-	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
-	 * <p>
-	 * The API migrates ongoing tasks and index shards to other nodes as needed to
-	 * prepare a node to be restarted or shut down and removed from the cluster.
-	 * This ensures that Elasticsearch can be stopped safely with minimal disruption
-	 * to the cluster.
-	 * <p>
-	 * You must specify the type of shutdown: <code>restart</code>,
-	 * <code>remove</code>, or <code>replace</code>. If a node is already being
-	 * prepared for shutdown, you can use this API to change the shutdown type.
-	 * <p>
-	 * IMPORTANT: This API does NOT terminate the Elasticsearch process. Monitor the
-	 * node shutdown status to determine when it is safe to stop Elasticsearch.
+	 * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+	 * Direct use is not supported.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/ElasticsearchShutdownClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/ElasticsearchShutdownClient.java
index 840334b97..d697c22ee 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/ElasticsearchShutdownClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/ElasticsearchShutdownClient.java
@@ -68,17 +68,8 @@ public ElasticsearchShutdownClient withTransportOptions(@Nullable TransportOptio
 	// ----- Endpoint: shutdown.delete_node
 
 	/**
-	 * Cancel node shutdown preparations. Remove a node from the shutdown list so it
-	 * can resume normal operations. You must explicitly clear the shutdown request
-	 * when a node rejoins the cluster or when a node has permanently left the
-	 * cluster. Shutdown requests are never removed automatically by Elasticsearch.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
-	 * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
-	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
+	 * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+	 * and ECK. Direct use is not supported.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current">Documentation
@@ -93,17 +84,8 @@ public DeleteNodeResponse deleteNode(DeleteNodeRequest request) throws IOExcepti
 	}
 
 	/**
-	 * Cancel node shutdown preparations. Remove a node from the shutdown list so it
-	 * can resume normal operations. You must explicitly clear the shutdown request
-	 * when a node rejoins the cluster or when a node has permanently left the
-	 * cluster. Shutdown requests are never removed automatically by Elasticsearch.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
-	 * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
-	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
+	 * Removes a node from the shutdown list. Designed for indirect use by ECE/ESS
+	 * and ECK. Direct use is not supported.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -121,18 +103,9 @@ public final DeleteNodeResponse deleteNode(Function<DeleteNodeRequest.Builder, O
 	// ----- Endpoint: shutdown.get_node
 
 	/**
-	 * Get the shutdown status.
-	 * <p>
-	 * Get information about nodes that are ready to be shut down, have shut down
-	 * preparations still in progress, or have stalled. The API returns status
-	 * information for each part of the shut down process.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elasticsearch Service,
-	 * Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
+	 * Retrieve status of a node or nodes that are currently marked as shutting
+	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
 	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current">Documentation
@@ -147,18 +120,9 @@ public GetNodeResponse getNode(GetNodeRequest request) throws IOException, Elast
 	}
 
 	/**
-	 * Get the shutdown status.
-	 * <p>
-	 * Get information about nodes that are ready to be shut down, have shut down
-	 * preparations still in progress, or have stalled. The API returns status
-	 * information for each part of the shut down process.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elasticsearch Service,
-	 * Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
+	 * Retrieve status of a node or nodes that are currently marked as shutting
+	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
 	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -174,18 +138,9 @@ public final GetNodeResponse getNode(Function<GetNodeRequest.Builder, ObjectBuil
 	}
 
 	/**
-	 * Get the shutdown status.
-	 * <p>
-	 * Get information about nodes that are ready to be shut down, have shut down
-	 * preparations still in progress, or have stalled. The API returns status
-	 * information for each part of the shut down process.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elasticsearch Service,
-	 * Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
+	 * Retrieve status of a node or nodes that are currently marked as shutting
+	 * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
 	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current">Documentation
@@ -200,26 +155,8 @@ public GetNodeResponse getNode() throws IOException, ElasticsearchException {
 	// ----- Endpoint: shutdown.put_node
 
 	/**
-	 * Prepare a node to be shut down.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
-	 * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
-	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
-	 * <p>
-	 * The API migrates ongoing tasks and index shards to other nodes as needed to
-	 * prepare a node to be restarted or shut down and removed from the cluster.
-	 * This ensures that Elasticsearch can be stopped safely with minimal disruption
-	 * to the cluster.
-	 * <p>
-	 * You must specify the type of shutdown: <code>restart</code>,
-	 * <code>remove</code>, or <code>replace</code>. If a node is already being
-	 * prepared for shutdown, you can use this API to change the shutdown type.
-	 * <p>
-	 * IMPORTANT: This API does NOT terminate the Elasticsearch process. Monitor the
-	 * node shutdown status to determine when it is safe to stop Elasticsearch.
+	 * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+	 * Direct use is not supported.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current">Documentation
@@ -234,26 +171,8 @@ public PutNodeResponse putNode(PutNodeRequest request) throws IOException, Elast
 	}
 
 	/**
-	 * Prepare a node to be shut down.
-	 * <p>
-	 * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
-	 * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
-	 * supported.
-	 * <p>
-	 * If the operator privileges feature is enabled, you must be an operator to use
-	 * this API.
-	 * <p>
-	 * The API migrates ongoing tasks and index shards to other nodes as needed to
-	 * prepare a node to be restarted or shut down and removed from the cluster.
-	 * This ensures that Elasticsearch can be stopped safely with minimal disruption
-	 * to the cluster.
-	 * <p>
-	 * You must specify the type of shutdown: <code>restart</code>,
-	 * <code>remove</code>, or <code>replace</code>. If a node is already being
-	 * prepared for shutdown, you can use this API to change the shutdown type.
-	 * <p>
-	 * IMPORTANT: This API does NOT terminate the Elasticsearch process. Monitor the
-	 * node shutdown status to determine when it is safe to stop Elasticsearch.
+	 * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+	 * Direct use is not supported.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/GetNodeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/GetNodeRequest.java
index 1c3dee599..42ee075c2 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/GetNodeRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/GetNodeRequest.java
@@ -58,18 +58,9 @@
 // typedef: shutdown.get_node.Request
 
 /**
- * Get the shutdown status.
- * <p>
- * Get information about nodes that are ready to be shut down, have shut down
- * preparations still in progress, or have stalled. The API returns status
- * information for each part of the shut down process.
- * <p>
- * NOTE: This feature is designed for indirect use by Elasticsearch Service,
- * Elastic Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
+ * Retrieve status of a node or nodes that are currently marked as shutting
+ * down. Designed for indirect use by ECE/ESS and ECK. Direct use is not
  * supported.
- * <p>
- * If the operator privileges feature is enabled, you must be an operator to use
- * this API.
  * 
  * @see <a href="../doc-files/api-spec.html#shutdown.get_node.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/PutNodeRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/PutNodeRequest.java
index af64a69ab..0eaa0a97b 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/PutNodeRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/shutdown/PutNodeRequest.java
@@ -58,26 +58,8 @@
 // typedef: shutdown.put_node.Request
 
 /**
- * Prepare a node to be shut down.
- * <p>
- * NOTE: This feature is designed for indirect use by Elastic Cloud, Elastic
- * Cloud Enterprise, and Elastic Cloud on Kubernetes. Direct use is not
- * supported.
- * <p>
- * If the operator privileges feature is enabled, you must be an operator to use
- * this API.
- * <p>
- * The API migrates ongoing tasks and index shards to other nodes as needed to
- * prepare a node to be restarted or shut down and removed from the cluster.
- * This ensures that Elasticsearch can be stopped safely with minimal disruption
- * to the cluster.
- * <p>
- * You must specify the type of shutdown: <code>restart</code>,
- * <code>remove</code>, or <code>replace</code>. If a node is already being
- * prepared for shutdown, you can use this API to change the shutdown type.
- * <p>
- * IMPORTANT: This API does NOT terminate the Elasticsearch process. Monitor the
- * node shutdown status to determine when it is safe to stop Elasticsearch.
+ * Adds a node to be shut down. Designed for indirect use by ECE/ESS and ECK.
+ * Direct use is not supported.
  * 
  * @see <a href="../doc-files/api-spec.html#shutdown.put_node.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/DeleteLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/DeleteLifecycleRequest.java
index c49fcccfc..ef16269fb 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/DeleteLifecycleRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/DeleteLifecycleRequest.java
@@ -56,9 +56,7 @@
 // typedef: slm.delete_lifecycle.Request
 
 /**
- * Delete a policy. Delete a snapshot lifecycle policy definition. This
- * operation prevents any future snapshots from being taken but does not cancel
- * in-progress snapshots or remove previously-taken snapshots.
+ * Deletes an existing snapshot lifecycle policy.
  * 
  * @see <a href="../doc-files/api-spec.html#slm.delete_lifecycle.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ElasticsearchSlmAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ElasticsearchSlmAsyncClient.java
index 85e081f42..43a51bc51 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ElasticsearchSlmAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ElasticsearchSlmAsyncClient.java
@@ -67,9 +67,7 @@ public ElasticsearchSlmAsyncClient withTransportOptions(@Nullable TransportOptio
 	// ----- Endpoint: slm.delete_lifecycle
 
 	/**
-	 * Delete a policy. Delete a snapshot lifecycle policy definition. This
-	 * operation prevents any future snapshots from being taken but does not cancel
-	 * in-progress snapshots or remove previously-taken snapshots.
+	 * Deletes an existing snapshot lifecycle policy.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-delete-policy.html">Documentation
@@ -84,9 +82,7 @@ public CompletableFuture<DeleteLifecycleResponse> deleteLifecycle(DeleteLifecycl
 	}
 
 	/**
-	 * Delete a policy. Delete a snapshot lifecycle policy definition. This
-	 * operation prevents any future snapshots from being taken but does not cancel
-	 * in-progress snapshots or remove previously-taken snapshots.
+	 * Deletes an existing snapshot lifecycle policy.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -104,10 +100,8 @@ public final CompletableFuture<DeleteLifecycleResponse> deleteLifecycle(
 	// ----- Endpoint: slm.execute_lifecycle
 
 	/**
-	 * Run a policy. Immediately create a snapshot according to the snapshot
-	 * lifecycle policy without waiting for the scheduled time. The snapshot policy
-	 * is normally applied according to its schedule, but you might want to manually
-	 * run a policy before performing an upgrade or other maintenance.
+	 * Immediately creates a snapshot according to the lifecycle policy, without
+	 * waiting for the scheduled time.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-execute-lifecycle.html">Documentation
@@ -122,10 +116,8 @@ public CompletableFuture<ExecuteLifecycleResponse> executeLifecycle(ExecuteLifec
 	}
 
 	/**
-	 * Run a policy. Immediately create a snapshot according to the snapshot
-	 * lifecycle policy without waiting for the scheduled time. The snapshot policy
-	 * is normally applied according to its schedule, but you might want to manually
-	 * run a policy before performing an upgrade or other maintenance.
+	 * Immediately creates a snapshot according to the lifecycle policy, without
+	 * waiting for the scheduled time.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -143,10 +135,8 @@ public final CompletableFuture<ExecuteLifecycleResponse> executeLifecycle(
 	// ----- Endpoint: slm.execute_retention
 
 	/**
-	 * Run a retention policy. Manually apply the retention policy to force
-	 * immediate removal of snapshots that are expired according to the snapshot
-	 * lifecycle policy retention rules. The retention policy is normally applied
-	 * according to its schedule.
+	 * Deletes any snapshots that are expired according to the policy's retention
+	 * rules.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-execute-retention.html">Documentation
@@ -160,8 +150,8 @@ public CompletableFuture<ExecuteRetentionResponse> executeRetention() {
 	// ----- Endpoint: slm.get_lifecycle
 
 	/**
-	 * Get policy information. Get snapshot lifecycle policy definitions and
-	 * information about the latest snapshot attempts.
+	 * Retrieves one or more snapshot lifecycle policy definitions and information
+	 * about the latest snapshot attempts.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-policy.html">Documentation
@@ -176,8 +166,8 @@ public CompletableFuture<GetLifecycleResponse> getLifecycle(GetLifecycleRequest
 	}
 
 	/**
-	 * Get policy information. Get snapshot lifecycle policy definitions and
-	 * information about the latest snapshot attempts.
+	 * Retrieves one or more snapshot lifecycle policy definitions and information
+	 * about the latest snapshot attempts.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -193,8 +183,8 @@ public final CompletableFuture<GetLifecycleResponse> getLifecycle(
 	}
 
 	/**
-	 * Get policy information. Get snapshot lifecycle policy definitions and
-	 * information about the latest snapshot attempts.
+	 * Retrieves one or more snapshot lifecycle policy definitions and information
+	 * about the latest snapshot attempts.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-policy.html">Documentation
@@ -209,8 +199,8 @@ public CompletableFuture<GetLifecycleResponse> getLifecycle() {
 	// ----- Endpoint: slm.get_stats
 
 	/**
-	 * Get snapshot lifecycle management statistics. Get global and policy-level
-	 * statistics about actions taken by snapshot lifecycle management.
+	 * Returns global and policy-level statistics about actions taken by snapshot
+	 * lifecycle management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/slm-api-get-stats.html">Documentation
@@ -224,7 +214,7 @@ public CompletableFuture<GetStatsResponse> getStats() {
 	// ----- Endpoint: slm.get_status
 
 	/**
-	 * Get the snapshot lifecycle management status.
+	 * Retrieves the status of snapshot lifecycle management (SLM).
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-status.html">Documentation
@@ -238,9 +228,7 @@ public CompletableFuture<GetSlmStatusResponse> getStatus() {
 	// ----- Endpoint: slm.put_lifecycle
 
 	/**
-	 * Create or update a policy. Create or update a snapshot lifecycle policy. If
-	 * the policy already exists, this request increments the policy version. Only
-	 * the latest version of a policy is stored.
+	 * Creates or updates a snapshot lifecycle policy.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-put-policy.html">Documentation
@@ -255,9 +243,7 @@ public CompletableFuture<PutLifecycleResponse> putLifecycle(PutLifecycleRequest
 	}
 
 	/**
-	 * Create or update a policy. Create or update a snapshot lifecycle policy. If
-	 * the policy already exists, this request increments the policy version. Only
-	 * the latest version of a policy is stored.
+	 * Creates or updates a snapshot lifecycle policy.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -275,9 +261,7 @@ public final CompletableFuture<PutLifecycleResponse> putLifecycle(
 	// ----- Endpoint: slm.start
 
 	/**
-	 * Start snapshot lifecycle management. Snapshot lifecycle management (SLM)
-	 * starts automatically when a cluster is formed. Manually starting SLM is
-	 * necessary only if it has been stopped using the stop SLM API.
+	 * Turns on snapshot lifecycle management (SLM).
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-start.html">Documentation
@@ -291,17 +275,7 @@ public CompletableFuture<StartSlmResponse> start() {
 	// ----- Endpoint: slm.stop
 
 	/**
-	 * Stop snapshot lifecycle management. Stop all snapshot lifecycle management
-	 * (SLM) operations and the SLM plugin. This API is useful when you are
-	 * performing maintenance on a cluster and need to prevent SLM from performing
-	 * any actions on your data streams or indices. Stopping SLM does not stop any
-	 * snapshots that are in progress. You can manually trigger snapshots with the
-	 * run snapshot lifecycle policy API even if SLM is stopped.
-	 * <p>
-	 * The API returns a response as soon as the request is acknowledged, but the
-	 * plugin might continue to run until in-progress operations complete and it can
-	 * be safely stopped. Use the get snapshot lifecycle management status API to
-	 * see if SLM is running.
+	 * Turns off snapshot lifecycle management (SLM).
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-stop.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ElasticsearchSlmClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ElasticsearchSlmClient.java
index ca233fa6d..a6cd5188e 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ElasticsearchSlmClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ElasticsearchSlmClient.java
@@ -68,9 +68,7 @@ public ElasticsearchSlmClient withTransportOptions(@Nullable TransportOptions tr
 	// ----- Endpoint: slm.delete_lifecycle
 
 	/**
-	 * Delete a policy. Delete a snapshot lifecycle policy definition. This
-	 * operation prevents any future snapshots from being taken but does not cancel
-	 * in-progress snapshots or remove previously-taken snapshots.
+	 * Deletes an existing snapshot lifecycle policy.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-delete-policy.html">Documentation
@@ -86,9 +84,7 @@ public DeleteLifecycleResponse deleteLifecycle(DeleteLifecycleRequest request)
 	}
 
 	/**
-	 * Delete a policy. Delete a snapshot lifecycle policy definition. This
-	 * operation prevents any future snapshots from being taken but does not cancel
-	 * in-progress snapshots or remove previously-taken snapshots.
+	 * Deletes an existing snapshot lifecycle policy.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -107,10 +103,8 @@ public final DeleteLifecycleResponse deleteLifecycle(
 	// ----- Endpoint: slm.execute_lifecycle
 
 	/**
-	 * Run a policy. Immediately create a snapshot according to the snapshot
-	 * lifecycle policy without waiting for the scheduled time. The snapshot policy
-	 * is normally applied according to its schedule, but you might want to manually
-	 * run a policy before performing an upgrade or other maintenance.
+	 * Immediately creates a snapshot according to the lifecycle policy, without
+	 * waiting for the scheduled time.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-execute-lifecycle.html">Documentation
@@ -126,10 +120,8 @@ public ExecuteLifecycleResponse executeLifecycle(ExecuteLifecycleRequest request
 	}
 
 	/**
-	 * Run a policy. Immediately create a snapshot according to the snapshot
-	 * lifecycle policy without waiting for the scheduled time. The snapshot policy
-	 * is normally applied according to its schedule, but you might want to manually
-	 * run a policy before performing an upgrade or other maintenance.
+	 * Immediately creates a snapshot according to the lifecycle policy, without
+	 * waiting for the scheduled time.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -148,10 +140,8 @@ public final ExecuteLifecycleResponse executeLifecycle(
 	// ----- Endpoint: slm.execute_retention
 
 	/**
-	 * Run a retention policy. Manually apply the retention policy to force
-	 * immediate removal of snapshots that are expired according to the snapshot
-	 * lifecycle policy retention rules. The retention policy is normally applied
-	 * according to its schedule.
+	 * Deletes any snapshots that are expired according to the policy's retention
+	 * rules.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-execute-retention.html">Documentation
@@ -165,8 +155,8 @@ public ExecuteRetentionResponse executeRetention() throws IOException, Elasticse
 	// ----- Endpoint: slm.get_lifecycle
 
 	/**
-	 * Get policy information. Get snapshot lifecycle policy definitions and
-	 * information about the latest snapshot attempts.
+	 * Retrieves one or more snapshot lifecycle policy definitions and information
+	 * about the latest snapshot attempts.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-policy.html">Documentation
@@ -181,8 +171,8 @@ public GetLifecycleResponse getLifecycle(GetLifecycleRequest request) throws IOE
 	}
 
 	/**
-	 * Get policy information. Get snapshot lifecycle policy definitions and
-	 * information about the latest snapshot attempts.
+	 * Retrieves one or more snapshot lifecycle policy definitions and information
+	 * about the latest snapshot attempts.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -199,8 +189,8 @@ public final GetLifecycleResponse getLifecycle(
 	}
 
 	/**
-	 * Get policy information. Get snapshot lifecycle policy definitions and
-	 * information about the latest snapshot attempts.
+	 * Retrieves one or more snapshot lifecycle policy definitions and information
+	 * about the latest snapshot attempts.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-policy.html">Documentation
@@ -215,8 +205,8 @@ public GetLifecycleResponse getLifecycle() throws IOException, ElasticsearchExce
 	// ----- Endpoint: slm.get_stats
 
 	/**
-	 * Get snapshot lifecycle management statistics. Get global and policy-level
-	 * statistics about actions taken by snapshot lifecycle management.
+	 * Returns global and policy-level statistics about actions taken by snapshot
+	 * lifecycle management.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/slm-api-get-stats.html">Documentation
@@ -230,7 +220,7 @@ public GetStatsResponse getStats() throws IOException, ElasticsearchException {
 	// ----- Endpoint: slm.get_status
 
 	/**
-	 * Get the snapshot lifecycle management status.
+	 * Retrieves the status of snapshot lifecycle management (SLM).
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-get-status.html">Documentation
@@ -244,9 +234,7 @@ public GetSlmStatusResponse getStatus() throws IOException, ElasticsearchExcepti
 	// ----- Endpoint: slm.put_lifecycle
 
 	/**
-	 * Create or update a policy. Create or update a snapshot lifecycle policy. If
-	 * the policy already exists, this request increments the policy version. Only
-	 * the latest version of a policy is stored.
+	 * Creates or updates a snapshot lifecycle policy.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-put-policy.html">Documentation
@@ -261,9 +249,7 @@ public PutLifecycleResponse putLifecycle(PutLifecycleRequest request) throws IOE
 	}
 
 	/**
-	 * Create or update a policy. Create or update a snapshot lifecycle policy. If
-	 * the policy already exists, this request increments the policy version. Only
-	 * the latest version of a policy is stored.
+	 * Creates or updates a snapshot lifecycle policy.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -282,9 +268,7 @@ public final PutLifecycleResponse putLifecycle(
 	// ----- Endpoint: slm.start
 
 	/**
-	 * Start snapshot lifecycle management. Snapshot lifecycle management (SLM)
-	 * starts automatically when a cluster is formed. Manually starting SLM is
-	 * necessary only if it has been stopped using the stop SLM API.
+	 * Turns on snapshot lifecycle management (SLM).
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-start.html">Documentation
@@ -298,17 +282,7 @@ public StartSlmResponse start() throws IOException, ElasticsearchException {
 	// ----- Endpoint: slm.stop
 
 	/**
-	 * Stop snapshot lifecycle management. Stop all snapshot lifecycle management
-	 * (SLM) operations and the SLM plugin. This API is useful when you are
-	 * performing maintenance on a cluster and need to prevent SLM from performing
-	 * any actions on your data streams or indices. Stopping SLM does not stop any
-	 * snapshots that are in progress. You can manually trigger snapshots with the
-	 * run snapshot lifecycle policy API even if SLM is stopped.
-	 * <p>
-	 * The API returns a response as soon as the request is acknowledged, but the
-	 * plugin might continue to run until in-progress operations complete and it can
-	 * be safely stopped. Use the get snapshot lifecycle management status API to
-	 * see if SLM is running.
+	 * Turns off snapshot lifecycle management (SLM).
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/current/slm-api-stop.html">Documentation
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ExecuteLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ExecuteLifecycleRequest.java
index abda3524d..fd0983d7e 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ExecuteLifecycleRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ExecuteLifecycleRequest.java
@@ -56,10 +56,8 @@
 // typedef: slm.execute_lifecycle.Request
 
 /**
- * Run a policy. Immediately create a snapshot according to the snapshot
- * lifecycle policy without waiting for the scheduled time. The snapshot policy
- * is normally applied according to its schedule, but you might want to manually
- * run a policy before performing an upgrade or other maintenance.
+ * Immediately creates a snapshot according to the lifecycle policy, without
+ * waiting for the scheduled time.
  * 
  * @see <a href="../doc-files/api-spec.html#slm.execute_lifecycle.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ExecuteRetentionRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ExecuteRetentionRequest.java
index 9755c009d..57ec5c733 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ExecuteRetentionRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/ExecuteRetentionRequest.java
@@ -50,10 +50,8 @@
 // typedef: slm.execute_retention.Request
 
 /**
- * Run a retention policy. Manually apply the retention policy to force
- * immediate removal of snapshots that are expired according to the snapshot
- * lifecycle policy retention rules. The retention policy is normally applied
- * according to its schedule.
+ * Deletes any snapshots that are expired according to the policy's retention
+ * rules.
  * 
  * @see <a href="../doc-files/api-spec.html#slm.execute_retention.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetLifecycleRequest.java
index f7b866993..6df555883 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetLifecycleRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetLifecycleRequest.java
@@ -58,8 +58,8 @@
 // typedef: slm.get_lifecycle.Request
 
 /**
- * Get policy information. Get snapshot lifecycle policy definitions and
- * information about the latest snapshot attempts.
+ * Retrieves one or more snapshot lifecycle policy definitions and information
+ * about the latest snapshot attempts.
  * 
  * @see <a href="../doc-files/api-spec.html#slm.get_lifecycle.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetSlmStatusRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetSlmStatusRequest.java
index fe707abbf..d575fbbe7 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetSlmStatusRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetSlmStatusRequest.java
@@ -50,7 +50,7 @@
 // typedef: slm.get_status.Request
 
 /**
- * Get the snapshot lifecycle management status.
+ * Retrieves the status of snapshot lifecycle management (SLM).
  * 
  * @see <a href="../doc-files/api-spec.html#slm.get_status.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetStatsRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetStatsRequest.java
index bd7b30c49..9fd0ed656 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetStatsRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/GetStatsRequest.java
@@ -50,8 +50,8 @@
 // typedef: slm.get_stats.Request
 
 /**
- * Get snapshot lifecycle management statistics. Get global and policy-level
- * statistics about actions taken by snapshot lifecycle management.
+ * Returns global and policy-level statistics about actions taken by snapshot
+ * lifecycle management.
  * 
  * @see <a href="../doc-files/api-spec.html#slm.get_stats.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/PutLifecycleRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/PutLifecycleRequest.java
index 5f1803804..ad68597ae 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/PutLifecycleRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/PutLifecycleRequest.java
@@ -58,9 +58,7 @@
 // typedef: slm.put_lifecycle.Request
 
 /**
- * Create or update a policy. Create or update a snapshot lifecycle policy. If
- * the policy already exists, this request increments the policy version. Only
- * the latest version of a policy is stored.
+ * Creates or updates a snapshot lifecycle policy.
  * 
  * @see <a href="../doc-files/api-spec.html#slm.put_lifecycle.Request">API
  *      specification</a>
@@ -143,8 +141,7 @@ public final String name() {
 	}
 
 	/**
-	 * Required - The identifier for the snapshot lifecycle policy you want to
-	 * create or update.
+	 * Required - ID for the snapshot lifecycle policy you want to create or update.
 	 * <p>
 	 * API name: {@code policy_id}
 	 */
@@ -320,8 +317,7 @@ public final Builder name(@Nullable String value) {
 		}
 
 		/**
-		 * Required - The identifier for the snapshot lifecycle policy you want to
-		 * create or update.
+		 * Required - ID for the snapshot lifecycle policy you want to create or update.
 		 * <p>
 		 * API name: {@code policy_id}
 		 */
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/StartSlmRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/StartSlmRequest.java
index c6ae7dcd9..2be9ce3f7 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/StartSlmRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/StartSlmRequest.java
@@ -50,9 +50,7 @@
 // typedef: slm.start.Request
 
 /**
- * Start snapshot lifecycle management. Snapshot lifecycle management (SLM)
- * starts automatically when a cluster is formed. Manually starting SLM is
- * necessary only if it has been stopped using the stop SLM API.
+ * Turns on snapshot lifecycle management (SLM).
  * 
  * @see <a href="../doc-files/api-spec.html#slm.start.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/StopSlmRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/StopSlmRequest.java
index 89925a268..bc7a32f73 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/StopSlmRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/slm/StopSlmRequest.java
@@ -50,17 +50,7 @@
 // typedef: slm.stop.Request
 
 /**
- * Stop snapshot lifecycle management. Stop all snapshot lifecycle management
- * (SLM) operations and the SLM plugin. This API is useful when you are
- * performing maintenance on a cluster and need to prevent SLM from performing
- * any actions on your data streams or indices. Stopping SLM does not stop any
- * snapshots that are in progress. You can manually trigger snapshots with the
- * run snapshot lifecycle policy API even if SLM is stopped.
- * <p>
- * The API returns a response as soon as the request is acknowledged, but the
- * plugin might continue to run until in-progress operations complete and it can
- * be safely stopped. Use the get snapshot lifecycle management status API to
- * see if SLM is running.
+ * Turns off snapshot lifecycle management (SLM).
  * 
  * @see <a href="../doc-files/api-spec.html#slm.stop.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CleanupRepositoryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CleanupRepositoryRequest.java
index 759d3157a..5626be8bd 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CleanupRepositoryRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CleanupRepositoryRequest.java
@@ -56,9 +56,8 @@
 // typedef: snapshot.cleanup_repository.Request
 
 /**
- * Clean up the snapshot repository. Trigger the review of the contents of a
- * snapshot repository and delete any stale data not referenced by existing
- * snapshots.
+ * Triggers the review of a snapshot repository’s contents and deletes any stale
+ * data not referenced by existing snapshots.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#snapshot.cleanup_repository.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CloneSnapshotRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CloneSnapshotRequest.java
index ab5a8ea0b..d23514cb8 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CloneSnapshotRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CloneSnapshotRequest.java
@@ -58,8 +58,8 @@
 // typedef: snapshot.clone.Request
 
 /**
- * Clone a snapshot. Clone part of all of a snapshot into another snapshot in
- * the same repository.
+ * Clones indices from one snapshot into another snapshot in the same
+ * repository.
  * 
  * @see <a href="../doc-files/api-spec.html#snapshot.clone.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CreateRepositoryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CreateRepositoryRequest.java
index 86eeca000..0bb69501c 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CreateRepositoryRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CreateRepositoryRequest.java
@@ -60,13 +60,7 @@
 // typedef: snapshot.create_repository.Request
 
 /**
- * Create or update a snapshot repository. IMPORTANT: If you are migrating
- * searchable snapshots, the repository name must be identical in the source and
- * destination clusters. To register a snapshot repository, the cluster's global
- * metadata must be writeable. Ensure there are no cluster blocks (for example,
- * <code>cluster.blocks.read_only</code> and
- * <code>clsuter.blocks.read_only_allow_delete</code> settings) that prevent
- * write access.
+ * Creates a repository.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#snapshot.create_repository.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CreateSnapshotRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CreateSnapshotRequest.java
index fc6be7a48..5a415b198 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CreateSnapshotRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/CreateSnapshotRequest.java
@@ -61,8 +61,7 @@
 // typedef: snapshot.create.Request
 
 /**
- * Create a snapshot. Take a snapshot of a cluster or of data streams and
- * indices.
+ * Creates a snapshot in a repository.
  * 
  * @see <a href="../doc-files/api-spec.html#snapshot.create.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteRepositoryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteRepositoryRequest.java
index 7521c6549..c8f2587ea 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteRepositoryRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteRepositoryRequest.java
@@ -58,10 +58,7 @@
 // typedef: snapshot.delete_repository.Request
 
 /**
- * Delete snapshot repositories. When a repository is unregistered,
- * Elasticsearch removes only the reference to the location where the repository
- * is storing the snapshots. The snapshots themselves are left untouched and in
- * place.
+ * Deletes a repository.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#snapshot.delete_repository.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteSnapshotRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteSnapshotRequest.java
index cfd12fe6b..fc29ad635 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteSnapshotRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/DeleteSnapshotRequest.java
@@ -56,7 +56,7 @@
 // typedef: snapshot.delete.Request
 
 /**
- * Delete snapshots.
+ * Deletes one or more snapshots.
  * 
  * @see <a href="../doc-files/api-spec.html#snapshot.delete.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/ElasticsearchSnapshotAsyncClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/ElasticsearchSnapshotAsyncClient.java
index 5d1708b5f..0b5bdfaca 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/ElasticsearchSnapshotAsyncClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/ElasticsearchSnapshotAsyncClient.java
@@ -70,9 +70,8 @@ public ElasticsearchSnapshotAsyncClient withTransportOptions(@Nullable Transport
 	// ----- Endpoint: snapshot.cleanup_repository
 
 	/**
-	 * Clean up the snapshot repository. Trigger the review of the contents of a
-	 * snapshot repository and delete any stale data not referenced by existing
-	 * snapshots.
+	 * Triggers the review of a snapshot repository’s contents and deletes any stale
+	 * data not referenced by existing snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/clean-up-snapshot-repo-api.html">Documentation
@@ -87,9 +86,8 @@ public CompletableFuture<CleanupRepositoryResponse> cleanupRepository(CleanupRep
 	}
 
 	/**
-	 * Clean up the snapshot repository. Trigger the review of the contents of a
-	 * snapshot repository and delete any stale data not referenced by existing
-	 * snapshots.
+	 * Triggers the review of a snapshot repository’s contents and deletes any stale
+	 * data not referenced by existing snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -107,8 +105,8 @@ public final CompletableFuture<CleanupRepositoryResponse> cleanupRepository(
 	// ----- Endpoint: snapshot.clone
 
 	/**
-	 * Clone a snapshot. Clone part of all of a snapshot into another snapshot in
-	 * the same repository.
+	 * Clones indices from one snapshot into another snapshot in the same
+	 * repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -123,8 +121,8 @@ public CompletableFuture<CloneSnapshotResponse> clone(CloneSnapshotRequest reque
 	}
 
 	/**
-	 * Clone a snapshot. Clone part of all of a snapshot into another snapshot in
-	 * the same repository.
+	 * Clones indices from one snapshot into another snapshot in the same
+	 * repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -142,8 +140,7 @@ public final CompletableFuture<CloneSnapshotResponse> clone(
 	// ----- Endpoint: snapshot.create
 
 	/**
-	 * Create a snapshot. Take a snapshot of a cluster or of data streams and
-	 * indices.
+	 * Creates a snapshot in a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -158,8 +155,7 @@ public CompletableFuture<CreateSnapshotResponse> create(CreateSnapshotRequest re
 	}
 
 	/**
-	 * Create a snapshot. Take a snapshot of a cluster or of data streams and
-	 * indices.
+	 * Creates a snapshot in a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -177,13 +173,7 @@ public final CompletableFuture<CreateSnapshotResponse> create(
 	// ----- Endpoint: snapshot.create_repository
 
 	/**
-	 * Create or update a snapshot repository. IMPORTANT: If you are migrating
-	 * searchable snapshots, the repository name must be identical in the source and
-	 * destination clusters. To register a snapshot repository, the cluster's global
-	 * metadata must be writeable. Ensure there are no cluster blocks (for example,
-	 * <code>cluster.blocks.read_only</code> and
-	 * <code>clsuter.blocks.read_only_allow_delete</code> settings) that prevent
-	 * write access.
+	 * Creates a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -198,13 +188,7 @@ public CompletableFuture<CreateRepositoryResponse> createRepository(CreateReposi
 	}
 
 	/**
-	 * Create or update a snapshot repository. IMPORTANT: If you are migrating
-	 * searchable snapshots, the repository name must be identical in the source and
-	 * destination clusters. To register a snapshot repository, the cluster's global
-	 * metadata must be writeable. Ensure there are no cluster blocks (for example,
-	 * <code>cluster.blocks.read_only</code> and
-	 * <code>clsuter.blocks.read_only_allow_delete</code> settings) that prevent
-	 * write access.
+	 * Creates a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -222,7 +206,7 @@ public final CompletableFuture<CreateRepositoryResponse> createRepository(
 	// ----- Endpoint: snapshot.delete
 
 	/**
-	 * Delete snapshots.
+	 * Deletes one or more snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -237,7 +221,7 @@ public CompletableFuture<DeleteSnapshotResponse> delete(DeleteSnapshotRequest re
 	}
 
 	/**
-	 * Delete snapshots.
+	 * Deletes one or more snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -255,10 +239,7 @@ public final CompletableFuture<DeleteSnapshotResponse> delete(
 	// ----- Endpoint: snapshot.delete_repository
 
 	/**
-	 * Delete snapshot repositories. When a repository is unregistered,
-	 * Elasticsearch removes only the reference to the location where the repository
-	 * is storing the snapshots. The snapshots themselves are left untouched and in
-	 * place.
+	 * Deletes a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -273,10 +254,7 @@ public CompletableFuture<DeleteRepositoryResponse> deleteRepository(DeleteReposi
 	}
 
 	/**
-	 * Delete snapshot repositories. When a repository is unregistered,
-	 * Elasticsearch removes only the reference to the location where the repository
-	 * is storing the snapshots. The snapshots themselves are left untouched and in
-	 * place.
+	 * Deletes a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -294,7 +272,7 @@ public final CompletableFuture<DeleteRepositoryResponse> deleteRepository(
 	// ----- Endpoint: snapshot.get
 
 	/**
-	 * Get snapshot information.
+	 * Returns information about a snapshot.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -309,7 +287,7 @@ public CompletableFuture<GetSnapshotResponse> get(GetSnapshotRequest request) {
 	}
 
 	/**
-	 * Get snapshot information.
+	 * Returns information about a snapshot.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -327,7 +305,7 @@ public final CompletableFuture<GetSnapshotResponse> get(
 	// ----- Endpoint: snapshot.get_repository
 
 	/**
-	 * Get snapshot repository information.
+	 * Returns information about a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -342,7 +320,7 @@ public CompletableFuture<GetRepositoryResponse> getRepository(GetRepositoryReque
 	}
 
 	/**
-	 * Get snapshot repository information.
+	 * Returns information about a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -358,7 +336,7 @@ public final CompletableFuture<GetRepositoryResponse> getRepository(
 	}
 
 	/**
-	 * Get snapshot repository information.
+	 * Returns information about a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -373,56 +351,7 @@ public CompletableFuture<GetRepositoryResponse> getRepository() {
 	// ----- Endpoint: snapshot.repository_verify_integrity
 
 	/**
-	 * Verify the repository integrity. Verify the integrity of the contents of a
-	 * snapshot repository.
-	 * <p>
-	 * This API enables you to perform a comprehensive check of the contents of a
-	 * repository, looking for any anomalies in its data or metadata which might
-	 * prevent you from restoring snapshots from the repository or which might cause
-	 * future snapshot create or delete operations to fail.
-	 * <p>
-	 * If you suspect the integrity of the contents of one of your snapshot
-	 * repositories, cease all write activity to this repository immediately, set
-	 * its <code>read_only</code> option to <code>true</code>, and use this API to
-	 * verify its integrity. Until you do so:
-	 * <ul>
-	 * <li>It may not be possible to restore some snapshots from this
-	 * repository.</li>
-	 * <li>Searchable snapshots may report errors when searched or may have
-	 * unassigned shards.</li>
-	 * <li>Taking snapshots into this repository may fail or may appear to succeed
-	 * but have created a snapshot which cannot be restored.</li>
-	 * <li>Deleting snapshots from this repository may fail or may appear to succeed
-	 * but leave the underlying data on disk.</li>
-	 * <li>Continuing to write to the repository while it is in an invalid state may
-	 * causing additional damage to its contents.</li>
-	 * </ul>
-	 * <p>
-	 * If the API finds any problems with the integrity of the contents of your
-	 * repository, Elasticsearch will not be able to repair the damage. The only way
-	 * to bring the repository back into a fully working state after its contents
-	 * have been damaged is by restoring its contents from a repository backup which
-	 * was taken before the damage occurred. You must also identify what caused the
-	 * damage and take action to prevent it from happening again.
-	 * <p>
-	 * If you cannot restore a repository backup, register a new repository and use
-	 * this for all future snapshot operations. In some cases it may be possible to
-	 * recover some of the contents of a damaged repository, either by restoring as
-	 * many of its snapshots as needed and taking new snapshots of the restored
-	 * data, or by using the reindex API to copy data from any searchable snapshots
-	 * mounted from the damaged repository.
-	 * <p>
-	 * Avoid all operations which write to the repository while the verify
-	 * repository integrity API is running. If something changes the repository
-	 * contents while an integrity verification is running then Elasticsearch may
-	 * incorrectly report having detected some anomalies in its contents due to the
-	 * concurrent writes. It may also incorrectly fail to report some anomalies that
-	 * the concurrent writes prevented it from detecting.
-	 * <p>
-	 * NOTE: This API is intended for exploratory use by humans. You should expect
-	 * the request parameters and the response format to vary in future versions.
-	 * <p>
-	 * NOTE: This API may not work correctly in a mixed-version cluster.
+	 * Verifies the integrity of the contents of a snapshot repository
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -438,56 +367,7 @@ public CompletableFuture<RepositoryVerifyIntegrityResponse> repositoryVerifyInte
 	}
 
 	/**
-	 * Verify the repository integrity. Verify the integrity of the contents of a
-	 * snapshot repository.
-	 * <p>
-	 * This API enables you to perform a comprehensive check of the contents of a
-	 * repository, looking for any anomalies in its data or metadata which might
-	 * prevent you from restoring snapshots from the repository or which might cause
-	 * future snapshot create or delete operations to fail.
-	 * <p>
-	 * If you suspect the integrity of the contents of one of your snapshot
-	 * repositories, cease all write activity to this repository immediately, set
-	 * its <code>read_only</code> option to <code>true</code>, and use this API to
-	 * verify its integrity. Until you do so:
-	 * <ul>
-	 * <li>It may not be possible to restore some snapshots from this
-	 * repository.</li>
-	 * <li>Searchable snapshots may report errors when searched or may have
-	 * unassigned shards.</li>
-	 * <li>Taking snapshots into this repository may fail or may appear to succeed
-	 * but have created a snapshot which cannot be restored.</li>
-	 * <li>Deleting snapshots from this repository may fail or may appear to succeed
-	 * but leave the underlying data on disk.</li>
-	 * <li>Continuing to write to the repository while it is in an invalid state may
-	 * causing additional damage to its contents.</li>
-	 * </ul>
-	 * <p>
-	 * If the API finds any problems with the integrity of the contents of your
-	 * repository, Elasticsearch will not be able to repair the damage. The only way
-	 * to bring the repository back into a fully working state after its contents
-	 * have been damaged is by restoring its contents from a repository backup which
-	 * was taken before the damage occurred. You must also identify what caused the
-	 * damage and take action to prevent it from happening again.
-	 * <p>
-	 * If you cannot restore a repository backup, register a new repository and use
-	 * this for all future snapshot operations. In some cases it may be possible to
-	 * recover some of the contents of a damaged repository, either by restoring as
-	 * many of its snapshots as needed and taking new snapshots of the restored
-	 * data, or by using the reindex API to copy data from any searchable snapshots
-	 * mounted from the damaged repository.
-	 * <p>
-	 * Avoid all operations which write to the repository while the verify
-	 * repository integrity API is running. If something changes the repository
-	 * contents while an integrity verification is running then Elasticsearch may
-	 * incorrectly report having detected some anomalies in its contents due to the
-	 * concurrent writes. It may also incorrectly fail to report some anomalies that
-	 * the concurrent writes prevented it from detecting.
-	 * <p>
-	 * NOTE: This API is intended for exploratory use by humans. You should expect
-	 * the request parameters and the response format to vary in future versions.
-	 * <p>
-	 * NOTE: This API may not work correctly in a mixed-version cluster.
+	 * Verifies the integrity of the contents of a snapshot repository
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -505,32 +385,7 @@ public final CompletableFuture<RepositoryVerifyIntegrityResponse> repositoryVeri
 	// ----- Endpoint: snapshot.restore
 
 	/**
-	 * Restore a snapshot. Restore a snapshot of a cluster or data streams and
-	 * indices.
-	 * <p>
-	 * You can restore a snapshot only to a running cluster with an elected master
-	 * node. The snapshot repository must be registered and available to the
-	 * cluster. The snapshot and cluster versions must be compatible.
-	 * <p>
-	 * To restore a snapshot, the cluster's global metadata must be writable. Ensure
-	 * there are't any cluster blocks that prevent writes. The restore operation
-	 * ignores index blocks.
-	 * <p>
-	 * Before you restore a data stream, ensure the cluster contains a matching
-	 * index template with data streams enabled. To check, use the index management
-	 * feature in Kibana or the get index template API:
-	 * 
-	 * <pre>
-	 * <code>GET _index_template/*?filter_path=index_templates.name,index_templates.index_template.index_patterns,index_templates.index_template.data_stream
-	 * </code>
-	 * </pre>
-	 * <p>
-	 * If no such template exists, you can create one or restore a cluster state
-	 * that contains one. Without a matching index template, a data stream can't
-	 * roll over or create backing indices.
-	 * <p>
-	 * If your snapshot contains data from App Search or Workplace Search, you must
-	 * restore the Enterprise Search encryption key before you restore the snapshot.
+	 * Restores a snapshot.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -545,32 +400,7 @@ public CompletableFuture<RestoreResponse> restore(RestoreRequest request) {
 	}
 
 	/**
-	 * Restore a snapshot. Restore a snapshot of a cluster or data streams and
-	 * indices.
-	 * <p>
-	 * You can restore a snapshot only to a running cluster with an elected master
-	 * node. The snapshot repository must be registered and available to the
-	 * cluster. The snapshot and cluster versions must be compatible.
-	 * <p>
-	 * To restore a snapshot, the cluster's global metadata must be writable. Ensure
-	 * there are't any cluster blocks that prevent writes. The restore operation
-	 * ignores index blocks.
-	 * <p>
-	 * Before you restore a data stream, ensure the cluster contains a matching
-	 * index template with data streams enabled. To check, use the index management
-	 * feature in Kibana or the get index template API:
-	 * 
-	 * <pre>
-	 * <code>GET _index_template/*?filter_path=index_templates.name,index_templates.index_template.index_patterns,index_templates.index_template.data_stream
-	 * </code>
-	 * </pre>
-	 * <p>
-	 * If no such template exists, you can create one or restore a cluster state
-	 * that contains one. Without a matching index template, a data stream can't
-	 * roll over or create backing indices.
-	 * <p>
-	 * If your snapshot contains data from App Search or Workplace Search, you must
-	 * restore the Enterprise Search encryption key before you restore the snapshot.
+	 * Restores a snapshot.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -588,21 +418,7 @@ public final CompletableFuture<RestoreResponse> restore(
 	// ----- Endpoint: snapshot.status
 
 	/**
-	 * Get the snapshot status. Get a detailed description of the current state for
-	 * each shard participating in the snapshot. Note that this API should be used
-	 * only to obtain detailed shard-level information for ongoing snapshots. If
-	 * this detail is not needed or you want to obtain information about one or more
-	 * existing snapshots, use the get snapshot API.
-	 * <p>
-	 * WARNING: Using the API to return the status of any snapshots other than
-	 * currently running snapshots can be expensive. The API requires a read from
-	 * the repository for each shard in each snapshot. For example, if you have 100
-	 * snapshots with 1,000 shards each, an API request that includes all snapshots
-	 * will require 100,000 reads (100 snapshots x 1,000 shards).
-	 * <p>
-	 * Depending on the latency of your storage, such requests can take an extremely
-	 * long time to return results. These requests can also tax machine resources
-	 * and, when using cloud storage, incur high processing costs.
+	 * Returns information about the status of a snapshot.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -617,21 +433,7 @@ public CompletableFuture<SnapshotStatusResponse> status(SnapshotStatusRequest re
 	}
 
 	/**
-	 * Get the snapshot status. Get a detailed description of the current state for
-	 * each shard participating in the snapshot. Note that this API should be used
-	 * only to obtain detailed shard-level information for ongoing snapshots. If
-	 * this detail is not needed or you want to obtain information about one or more
-	 * existing snapshots, use the get snapshot API.
-	 * <p>
-	 * WARNING: Using the API to return the status of any snapshots other than
-	 * currently running snapshots can be expensive. The API requires a read from
-	 * the repository for each shard in each snapshot. For example, if you have 100
-	 * snapshots with 1,000 shards each, an API request that includes all snapshots
-	 * will require 100,000 reads (100 snapshots x 1,000 shards).
-	 * <p>
-	 * Depending on the latency of your storage, such requests can take an extremely
-	 * long time to return results. These requests can also tax machine resources
-	 * and, when using cloud storage, incur high processing costs.
+	 * Returns information about the status of a snapshot.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -647,21 +449,7 @@ public final CompletableFuture<SnapshotStatusResponse> status(
 	}
 
 	/**
-	 * Get the snapshot status. Get a detailed description of the current state for
-	 * each shard participating in the snapshot. Note that this API should be used
-	 * only to obtain detailed shard-level information for ongoing snapshots. If
-	 * this detail is not needed or you want to obtain information about one or more
-	 * existing snapshots, use the get snapshot API.
-	 * <p>
-	 * WARNING: Using the API to return the status of any snapshots other than
-	 * currently running snapshots can be expensive. The API requires a read from
-	 * the repository for each shard in each snapshot. For example, if you have 100
-	 * snapshots with 1,000 shards each, an API request that includes all snapshots
-	 * will require 100,000 reads (100 snapshots x 1,000 shards).
-	 * <p>
-	 * Depending on the latency of your storage, such requests can take an extremely
-	 * long time to return results. These requests can also tax machine resources
-	 * and, when using cloud storage, incur high processing costs.
+	 * Returns information about the status of a snapshot.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -676,8 +464,7 @@ public CompletableFuture<SnapshotStatusResponse> status() {
 	// ----- Endpoint: snapshot.verify_repository
 
 	/**
-	 * Verify a snapshot repository. Check for common misconfigurations in a
-	 * snapshot repository.
+	 * Verifies a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -692,8 +479,7 @@ public CompletableFuture<VerifyRepositoryResponse> verifyRepository(VerifyReposi
 	}
 
 	/**
-	 * Verify a snapshot repository. Check for common misconfigurations in a
-	 * snapshot repository.
+	 * Verifies a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/ElasticsearchSnapshotClient.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/ElasticsearchSnapshotClient.java
index 2866e1630..8e0b2dee8 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/ElasticsearchSnapshotClient.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/ElasticsearchSnapshotClient.java
@@ -68,9 +68,8 @@ public ElasticsearchSnapshotClient withTransportOptions(@Nullable TransportOptio
 	// ----- Endpoint: snapshot.cleanup_repository
 
 	/**
-	 * Clean up the snapshot repository. Trigger the review of the contents of a
-	 * snapshot repository and delete any stale data not referenced by existing
-	 * snapshots.
+	 * Triggers the review of a snapshot repository’s contents and deletes any stale
+	 * data not referenced by existing snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/clean-up-snapshot-repo-api.html">Documentation
@@ -86,9 +85,8 @@ public CleanupRepositoryResponse cleanupRepository(CleanupRepositoryRequest requ
 	}
 
 	/**
-	 * Clean up the snapshot repository. Trigger the review of the contents of a
-	 * snapshot repository and delete any stale data not referenced by existing
-	 * snapshots.
+	 * Triggers the review of a snapshot repository’s contents and deletes any stale
+	 * data not referenced by existing snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -107,8 +105,8 @@ public final CleanupRepositoryResponse cleanupRepository(
 	// ----- Endpoint: snapshot.clone
 
 	/**
-	 * Clone a snapshot. Clone part of all of a snapshot into another snapshot in
-	 * the same repository.
+	 * Clones indices from one snapshot into another snapshot in the same
+	 * repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -123,8 +121,8 @@ public CloneSnapshotResponse clone(CloneSnapshotRequest request) throws IOExcept
 	}
 
 	/**
-	 * Clone a snapshot. Clone part of all of a snapshot into another snapshot in
-	 * the same repository.
+	 * Clones indices from one snapshot into another snapshot in the same
+	 * repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -143,8 +141,7 @@ public final CloneSnapshotResponse clone(
 	// ----- Endpoint: snapshot.create
 
 	/**
-	 * Create a snapshot. Take a snapshot of a cluster or of data streams and
-	 * indices.
+	 * Creates a snapshot in a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -159,8 +156,7 @@ public CreateSnapshotResponse create(CreateSnapshotRequest request) throws IOExc
 	}
 
 	/**
-	 * Create a snapshot. Take a snapshot of a cluster or of data streams and
-	 * indices.
+	 * Creates a snapshot in a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -179,13 +175,7 @@ public final CreateSnapshotResponse create(
 	// ----- Endpoint: snapshot.create_repository
 
 	/**
-	 * Create or update a snapshot repository. IMPORTANT: If you are migrating
-	 * searchable snapshots, the repository name must be identical in the source and
-	 * destination clusters. To register a snapshot repository, the cluster's global
-	 * metadata must be writeable. Ensure there are no cluster blocks (for example,
-	 * <code>cluster.blocks.read_only</code> and
-	 * <code>clsuter.blocks.read_only_allow_delete</code> settings) that prevent
-	 * write access.
+	 * Creates a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -201,13 +191,7 @@ public CreateRepositoryResponse createRepository(CreateRepositoryRequest request
 	}
 
 	/**
-	 * Create or update a snapshot repository. IMPORTANT: If you are migrating
-	 * searchable snapshots, the repository name must be identical in the source and
-	 * destination clusters. To register a snapshot repository, the cluster's global
-	 * metadata must be writeable. Ensure there are no cluster blocks (for example,
-	 * <code>cluster.blocks.read_only</code> and
-	 * <code>clsuter.blocks.read_only_allow_delete</code> settings) that prevent
-	 * write access.
+	 * Creates a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -226,7 +210,7 @@ public final CreateRepositoryResponse createRepository(
 	// ----- Endpoint: snapshot.delete
 
 	/**
-	 * Delete snapshots.
+	 * Deletes one or more snapshots.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -241,7 +225,7 @@ public DeleteSnapshotResponse delete(DeleteSnapshotRequest request) throws IOExc
 	}
 
 	/**
-	 * Delete snapshots.
+	 * Deletes one or more snapshots.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -260,10 +244,7 @@ public final DeleteSnapshotResponse delete(
 	// ----- Endpoint: snapshot.delete_repository
 
 	/**
-	 * Delete snapshot repositories. When a repository is unregistered,
-	 * Elasticsearch removes only the reference to the location where the repository
-	 * is storing the snapshots. The snapshots themselves are left untouched and in
-	 * place.
+	 * Deletes a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -279,10 +260,7 @@ public DeleteRepositoryResponse deleteRepository(DeleteRepositoryRequest request
 	}
 
 	/**
-	 * Delete snapshot repositories. When a repository is unregistered,
-	 * Elasticsearch removes only the reference to the location where the repository
-	 * is storing the snapshots. The snapshots themselves are left untouched and in
-	 * place.
+	 * Deletes a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -301,7 +279,7 @@ public final DeleteRepositoryResponse deleteRepository(
 	// ----- Endpoint: snapshot.get
 
 	/**
-	 * Get snapshot information.
+	 * Returns information about a snapshot.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -316,7 +294,7 @@ public GetSnapshotResponse get(GetSnapshotRequest request) throws IOException, E
 	}
 
 	/**
-	 * Get snapshot information.
+	 * Returns information about a snapshot.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -334,7 +312,7 @@ public final GetSnapshotResponse get(Function<GetSnapshotRequest.Builder, Object
 	// ----- Endpoint: snapshot.get_repository
 
 	/**
-	 * Get snapshot repository information.
+	 * Returns information about a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -350,7 +328,7 @@ public GetRepositoryResponse getRepository(GetRepositoryRequest request)
 	}
 
 	/**
-	 * Get snapshot repository information.
+	 * Returns information about a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -367,7 +345,7 @@ public final GetRepositoryResponse getRepository(
 	}
 
 	/**
-	 * Get snapshot repository information.
+	 * Returns information about a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -382,56 +360,7 @@ public GetRepositoryResponse getRepository() throws IOException, ElasticsearchEx
 	// ----- Endpoint: snapshot.repository_verify_integrity
 
 	/**
-	 * Verify the repository integrity. Verify the integrity of the contents of a
-	 * snapshot repository.
-	 * <p>
-	 * This API enables you to perform a comprehensive check of the contents of a
-	 * repository, looking for any anomalies in its data or metadata which might
-	 * prevent you from restoring snapshots from the repository or which might cause
-	 * future snapshot create or delete operations to fail.
-	 * <p>
-	 * If you suspect the integrity of the contents of one of your snapshot
-	 * repositories, cease all write activity to this repository immediately, set
-	 * its <code>read_only</code> option to <code>true</code>, and use this API to
-	 * verify its integrity. Until you do so:
-	 * <ul>
-	 * <li>It may not be possible to restore some snapshots from this
-	 * repository.</li>
-	 * <li>Searchable snapshots may report errors when searched or may have
-	 * unassigned shards.</li>
-	 * <li>Taking snapshots into this repository may fail or may appear to succeed
-	 * but have created a snapshot which cannot be restored.</li>
-	 * <li>Deleting snapshots from this repository may fail or may appear to succeed
-	 * but leave the underlying data on disk.</li>
-	 * <li>Continuing to write to the repository while it is in an invalid state may
-	 * causing additional damage to its contents.</li>
-	 * </ul>
-	 * <p>
-	 * If the API finds any problems with the integrity of the contents of your
-	 * repository, Elasticsearch will not be able to repair the damage. The only way
-	 * to bring the repository back into a fully working state after its contents
-	 * have been damaged is by restoring its contents from a repository backup which
-	 * was taken before the damage occurred. You must also identify what caused the
-	 * damage and take action to prevent it from happening again.
-	 * <p>
-	 * If you cannot restore a repository backup, register a new repository and use
-	 * this for all future snapshot operations. In some cases it may be possible to
-	 * recover some of the contents of a damaged repository, either by restoring as
-	 * many of its snapshots as needed and taking new snapshots of the restored
-	 * data, or by using the reindex API to copy data from any searchable snapshots
-	 * mounted from the damaged repository.
-	 * <p>
-	 * Avoid all operations which write to the repository while the verify
-	 * repository integrity API is running. If something changes the repository
-	 * contents while an integrity verification is running then Elasticsearch may
-	 * incorrectly report having detected some anomalies in its contents due to the
-	 * concurrent writes. It may also incorrectly fail to report some anomalies that
-	 * the concurrent writes prevented it from detecting.
-	 * <p>
-	 * NOTE: This API is intended for exploratory use by humans. You should expect
-	 * the request parameters and the response format to vary in future versions.
-	 * <p>
-	 * NOTE: This API may not work correctly in a mixed-version cluster.
+	 * Verifies the integrity of the contents of a snapshot repository
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -447,56 +376,7 @@ public RepositoryVerifyIntegrityResponse repositoryVerifyIntegrity(RepositoryVer
 	}
 
 	/**
-	 * Verify the repository integrity. Verify the integrity of the contents of a
-	 * snapshot repository.
-	 * <p>
-	 * This API enables you to perform a comprehensive check of the contents of a
-	 * repository, looking for any anomalies in its data or metadata which might
-	 * prevent you from restoring snapshots from the repository or which might cause
-	 * future snapshot create or delete operations to fail.
-	 * <p>
-	 * If you suspect the integrity of the contents of one of your snapshot
-	 * repositories, cease all write activity to this repository immediately, set
-	 * its <code>read_only</code> option to <code>true</code>, and use this API to
-	 * verify its integrity. Until you do so:
-	 * <ul>
-	 * <li>It may not be possible to restore some snapshots from this
-	 * repository.</li>
-	 * <li>Searchable snapshots may report errors when searched or may have
-	 * unassigned shards.</li>
-	 * <li>Taking snapshots into this repository may fail or may appear to succeed
-	 * but have created a snapshot which cannot be restored.</li>
-	 * <li>Deleting snapshots from this repository may fail or may appear to succeed
-	 * but leave the underlying data on disk.</li>
-	 * <li>Continuing to write to the repository while it is in an invalid state may
-	 * causing additional damage to its contents.</li>
-	 * </ul>
-	 * <p>
-	 * If the API finds any problems with the integrity of the contents of your
-	 * repository, Elasticsearch will not be able to repair the damage. The only way
-	 * to bring the repository back into a fully working state after its contents
-	 * have been damaged is by restoring its contents from a repository backup which
-	 * was taken before the damage occurred. You must also identify what caused the
-	 * damage and take action to prevent it from happening again.
-	 * <p>
-	 * If you cannot restore a repository backup, register a new repository and use
-	 * this for all future snapshot operations. In some cases it may be possible to
-	 * recover some of the contents of a damaged repository, either by restoring as
-	 * many of its snapshots as needed and taking new snapshots of the restored
-	 * data, or by using the reindex API to copy data from any searchable snapshots
-	 * mounted from the damaged repository.
-	 * <p>
-	 * Avoid all operations which write to the repository while the verify
-	 * repository integrity API is running. If something changes the repository
-	 * contents while an integrity verification is running then Elasticsearch may
-	 * incorrectly report having detected some anomalies in its contents due to the
-	 * concurrent writes. It may also incorrectly fail to report some anomalies that
-	 * the concurrent writes prevented it from detecting.
-	 * <p>
-	 * NOTE: This API is intended for exploratory use by humans. You should expect
-	 * the request parameters and the response format to vary in future versions.
-	 * <p>
-	 * NOTE: This API may not work correctly in a mixed-version cluster.
+	 * Verifies the integrity of the contents of a snapshot repository
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -515,32 +395,7 @@ public final RepositoryVerifyIntegrityResponse repositoryVerifyIntegrity(
 	// ----- Endpoint: snapshot.restore
 
 	/**
-	 * Restore a snapshot. Restore a snapshot of a cluster or data streams and
-	 * indices.
-	 * <p>
-	 * You can restore a snapshot only to a running cluster with an elected master
-	 * node. The snapshot repository must be registered and available to the
-	 * cluster. The snapshot and cluster versions must be compatible.
-	 * <p>
-	 * To restore a snapshot, the cluster's global metadata must be writable. Ensure
-	 * there are't any cluster blocks that prevent writes. The restore operation
-	 * ignores index blocks.
-	 * <p>
-	 * Before you restore a data stream, ensure the cluster contains a matching
-	 * index template with data streams enabled. To check, use the index management
-	 * feature in Kibana or the get index template API:
-	 * 
-	 * <pre>
-	 * <code>GET _index_template/*?filter_path=index_templates.name,index_templates.index_template.index_patterns,index_templates.index_template.data_stream
-	 * </code>
-	 * </pre>
-	 * <p>
-	 * If no such template exists, you can create one or restore a cluster state
-	 * that contains one. Without a matching index template, a data stream can't
-	 * roll over or create backing indices.
-	 * <p>
-	 * If your snapshot contains data from App Search or Workplace Search, you must
-	 * restore the Enterprise Search encryption key before you restore the snapshot.
+	 * Restores a snapshot.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -555,32 +410,7 @@ public RestoreResponse restore(RestoreRequest request) throws IOException, Elast
 	}
 
 	/**
-	 * Restore a snapshot. Restore a snapshot of a cluster or data streams and
-	 * indices.
-	 * <p>
-	 * You can restore a snapshot only to a running cluster with an elected master
-	 * node. The snapshot repository must be registered and available to the
-	 * cluster. The snapshot and cluster versions must be compatible.
-	 * <p>
-	 * To restore a snapshot, the cluster's global metadata must be writable. Ensure
-	 * there are't any cluster blocks that prevent writes. The restore operation
-	 * ignores index blocks.
-	 * <p>
-	 * Before you restore a data stream, ensure the cluster contains a matching
-	 * index template with data streams enabled. To check, use the index management
-	 * feature in Kibana or the get index template API:
-	 * 
-	 * <pre>
-	 * <code>GET _index_template/*?filter_path=index_templates.name,index_templates.index_template.index_patterns,index_templates.index_template.data_stream
-	 * </code>
-	 * </pre>
-	 * <p>
-	 * If no such template exists, you can create one or restore a cluster state
-	 * that contains one. Without a matching index template, a data stream can't
-	 * roll over or create backing indices.
-	 * <p>
-	 * If your snapshot contains data from App Search or Workplace Search, you must
-	 * restore the Enterprise Search encryption key before you restore the snapshot.
+	 * Restores a snapshot.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -598,21 +428,7 @@ public final RestoreResponse restore(Function<RestoreRequest.Builder, ObjectBuil
 	// ----- Endpoint: snapshot.status
 
 	/**
-	 * Get the snapshot status. Get a detailed description of the current state for
-	 * each shard participating in the snapshot. Note that this API should be used
-	 * only to obtain detailed shard-level information for ongoing snapshots. If
-	 * this detail is not needed or you want to obtain information about one or more
-	 * existing snapshots, use the get snapshot API.
-	 * <p>
-	 * WARNING: Using the API to return the status of any snapshots other than
-	 * currently running snapshots can be expensive. The API requires a read from
-	 * the repository for each shard in each snapshot. For example, if you have 100
-	 * snapshots with 1,000 shards each, an API request that includes all snapshots
-	 * will require 100,000 reads (100 snapshots x 1,000 shards).
-	 * <p>
-	 * Depending on the latency of your storage, such requests can take an extremely
-	 * long time to return results. These requests can also tax machine resources
-	 * and, when using cloud storage, incur high processing costs.
+	 * Returns information about the status of a snapshot.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -627,21 +443,7 @@ public SnapshotStatusResponse status(SnapshotStatusRequest request) throws IOExc
 	}
 
 	/**
-	 * Get the snapshot status. Get a detailed description of the current state for
-	 * each shard participating in the snapshot. Note that this API should be used
-	 * only to obtain detailed shard-level information for ongoing snapshots. If
-	 * this detail is not needed or you want to obtain information about one or more
-	 * existing snapshots, use the get snapshot API.
-	 * <p>
-	 * WARNING: Using the API to return the status of any snapshots other than
-	 * currently running snapshots can be expensive. The API requires a read from
-	 * the repository for each shard in each snapshot. For example, if you have 100
-	 * snapshots with 1,000 shards each, an API request that includes all snapshots
-	 * will require 100,000 reads (100 snapshots x 1,000 shards).
-	 * <p>
-	 * Depending on the latency of your storage, such requests can take an extremely
-	 * long time to return results. These requests can also tax machine resources
-	 * and, when using cloud storage, incur high processing costs.
+	 * Returns information about the status of a snapshot.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
@@ -658,21 +460,7 @@ public final SnapshotStatusResponse status(
 	}
 
 	/**
-	 * Get the snapshot status. Get a detailed description of the current state for
-	 * each shard participating in the snapshot. Note that this API should be used
-	 * only to obtain detailed shard-level information for ongoing snapshots. If
-	 * this detail is not needed or you want to obtain information about one or more
-	 * existing snapshots, use the get snapshot API.
-	 * <p>
-	 * WARNING: Using the API to return the status of any snapshots other than
-	 * currently running snapshots can be expensive. The API requires a read from
-	 * the repository for each shard in each snapshot. For example, if you have 100
-	 * snapshots with 1,000 shards each, an API request that includes all snapshots
-	 * will require 100,000 reads (100 snapshots x 1,000 shards).
-	 * <p>
-	 * Depending on the latency of your storage, such requests can take an extremely
-	 * long time to return results. These requests can also tax machine resources
-	 * and, when using cloud storage, incur high processing costs.
+	 * Returns information about the status of a snapshot.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -687,8 +475,7 @@ public SnapshotStatusResponse status() throws IOException, ElasticsearchExceptio
 	// ----- Endpoint: snapshot.verify_repository
 
 	/**
-	 * Verify a snapshot repository. Check for common misconfigurations in a
-	 * snapshot repository.
+	 * Verifies a repository.
 	 * 
 	 * @see <a href=
 	 *      "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">Documentation
@@ -704,8 +491,7 @@ public VerifyRepositoryResponse verifyRepository(VerifyRepositoryRequest request
 	}
 
 	/**
-	 * Verify a snapshot repository. Check for common misconfigurations in a
-	 * snapshot repository.
+	 * Verifies a repository.
 	 * 
 	 * @param fn
 	 *            a function that initializes a builder to create the
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetRepositoryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetRepositoryRequest.java
index 305661c71..55a08eeba 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetRepositoryRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetRepositoryRequest.java
@@ -59,7 +59,7 @@
 // typedef: snapshot.get_repository.Request
 
 /**
- * Get snapshot repository information.
+ * Returns information about a repository.
  * 
  * @see <a href="../doc-files/api-spec.html#snapshot.get_repository.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetSnapshotRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetSnapshotRequest.java
index b62955a32..90544d289 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetSnapshotRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/GetSnapshotRequest.java
@@ -61,7 +61,7 @@
 // typedef: snapshot.get.Request
 
 /**
- * Get snapshot information.
+ * Returns information about a snapshot.
  * 
  * @see <a href="../doc-files/api-spec.html#snapshot.get.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryVerifyIntegrityRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryVerifyIntegrityRequest.java
index 632463a4e..a71c3ea66 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryVerifyIntegrityRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RepositoryVerifyIntegrityRequest.java
@@ -59,56 +59,7 @@
 // typedef: snapshot.repository_verify_integrity.Request
 
 /**
- * Verify the repository integrity. Verify the integrity of the contents of a
- * snapshot repository.
- * <p>
- * This API enables you to perform a comprehensive check of the contents of a
- * repository, looking for any anomalies in its data or metadata which might
- * prevent you from restoring snapshots from the repository or which might cause
- * future snapshot create or delete operations to fail.
- * <p>
- * If you suspect the integrity of the contents of one of your snapshot
- * repositories, cease all write activity to this repository immediately, set
- * its <code>read_only</code> option to <code>true</code>, and use this API to
- * verify its integrity. Until you do so:
- * <ul>
- * <li>It may not be possible to restore some snapshots from this
- * repository.</li>
- * <li>Searchable snapshots may report errors when searched or may have
- * unassigned shards.</li>
- * <li>Taking snapshots into this repository may fail or may appear to succeed
- * but have created a snapshot which cannot be restored.</li>
- * <li>Deleting snapshots from this repository may fail or may appear to succeed
- * but leave the underlying data on disk.</li>
- * <li>Continuing to write to the repository while it is in an invalid state may
- * causing additional damage to its contents.</li>
- * </ul>
- * <p>
- * If the API finds any problems with the integrity of the contents of your
- * repository, Elasticsearch will not be able to repair the damage. The only way
- * to bring the repository back into a fully working state after its contents
- * have been damaged is by restoring its contents from a repository backup which
- * was taken before the damage occurred. You must also identify what caused the
- * damage and take action to prevent it from happening again.
- * <p>
- * If you cannot restore a repository backup, register a new repository and use
- * this for all future snapshot operations. In some cases it may be possible to
- * recover some of the contents of a damaged repository, either by restoring as
- * many of its snapshots as needed and taking new snapshots of the restored
- * data, or by using the reindex API to copy data from any searchable snapshots
- * mounted from the damaged repository.
- * <p>
- * Avoid all operations which write to the repository while the verify
- * repository integrity API is running. If something changes the repository
- * contents while an integrity verification is running then Elasticsearch may
- * incorrectly report having detected some anomalies in its contents due to the
- * concurrent writes. It may also incorrectly fail to report some anomalies that
- * the concurrent writes prevented it from detecting.
- * <p>
- * NOTE: This API is intended for exploratory use by humans. You should expect
- * the request parameters and the response format to vary in future versions.
- * <p>
- * NOTE: This API may not work correctly in a mixed-version cluster.
+ * Verifies the integrity of the contents of a snapshot repository
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#snapshot.repository_verify_integrity.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RestoreRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RestoreRequest.java
index 509e7f8a9..1176d6dac 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RestoreRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/RestoreRequest.java
@@ -61,32 +61,7 @@
 // typedef: snapshot.restore.Request
 
 /**
- * Restore a snapshot. Restore a snapshot of a cluster or data streams and
- * indices.
- * <p>
- * You can restore a snapshot only to a running cluster with an elected master
- * node. The snapshot repository must be registered and available to the
- * cluster. The snapshot and cluster versions must be compatible.
- * <p>
- * To restore a snapshot, the cluster's global metadata must be writable. Ensure
- * there are't any cluster blocks that prevent writes. The restore operation
- * ignores index blocks.
- * <p>
- * Before you restore a data stream, ensure the cluster contains a matching
- * index template with data streams enabled. To check, use the index management
- * feature in Kibana or the get index template API:
- * 
- * <pre>
- * <code>GET _index_template/*?filter_path=index_templates.name,index_templates.index_template.index_patterns,index_templates.index_template.data_stream
- * </code>
- * </pre>
- * <p>
- * If no such template exists, you can create one or restore a cluster state
- * that contains one. Without a matching index template, a data stream can't
- * roll over or create backing indices.
- * <p>
- * If your snapshot contains data from App Search or Workplace Search, you must
- * restore the Enterprise Search encryption key before you restore the snapshot.
+ * Restores a snapshot.
  * 
  * @see <a href="../doc-files/api-spec.html#snapshot.restore.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/SnapshotStatusRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/SnapshotStatusRequest.java
index 45641441c..c9da0634a 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/SnapshotStatusRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/SnapshotStatusRequest.java
@@ -59,21 +59,7 @@
 // typedef: snapshot.status.Request
 
 /**
- * Get the snapshot status. Get a detailed description of the current state for
- * each shard participating in the snapshot. Note that this API should be used
- * only to obtain detailed shard-level information for ongoing snapshots. If
- * this detail is not needed or you want to obtain information about one or more
- * existing snapshots, use the get snapshot API.
- * <p>
- * WARNING: Using the API to return the status of any snapshots other than
- * currently running snapshots can be expensive. The API requires a read from
- * the repository for each shard in each snapshot. For example, if you have 100
- * snapshots with 1,000 shards each, an API request that includes all snapshots
- * will require 100,000 reads (100 snapshots x 1,000 shards).
- * <p>
- * Depending on the latency of your storage, such requests can take an extremely
- * long time to return results. These requests can also tax machine resources
- * and, when using cloud storage, incur high processing costs.
+ * Returns information about the status of a snapshot.
  * 
  * @see <a href="../doc-files/api-spec.html#snapshot.status.Request">API
  *      specification</a>
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/VerifyRepositoryRequest.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/VerifyRepositoryRequest.java
index 2371c4f0f..fffc7bc18 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/VerifyRepositoryRequest.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/snapshot/VerifyRepositoryRequest.java
@@ -56,8 +56,7 @@
 // typedef: snapshot.verify_repository.Request
 
 /**
- * Verify a snapshot repository. Check for common misconfigurations in a
- * snapshot repository.
+ * Verifies a repository.
  * 
  * @see <a href=
  *      "../doc-files/api-spec.html#snapshot.verify_repository.Request">API
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Schedule.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Schedule.java
index 115bdfb4b..ed6ec0005 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Schedule.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Schedule.java
@@ -76,8 +76,6 @@ public class Schedule implements TaggedUnion<Schedule.Kind, Object>, TriggerVari
 	 */
 
 	public enum Kind implements JsonEnum {
-		Timezone("timezone"),
-
 		Cron("cron"),
 
 		Daily("daily"),
@@ -145,23 +143,6 @@ public static Schedule of(Function<Builder, ObjectBuilder<Schedule>> fn) {
 		return fn.apply(new Builder()).build();
 	}
 
-	/**
-	 * Is this variant instance of kind {@code timezone}?
-	 */
-	public boolean isTimezone() {
-		return _kind == Kind.Timezone;
-	}
-
-	/**
-	 * Get the {@code timezone} variant value.
-	 *
-	 * @throws IllegalStateException
-	 *             if the current variant is not of the {@code timezone} kind.
-	 */
-	public String timezone() {
-		return TaggedUnionUtils.get(this, Kind.Timezone);
-	}
-
 	/**
 	 * Is this variant instance of kind {@code cron}?
 	 */
@@ -292,10 +273,6 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 			((JsonpSerializable) _value).serialize(generator, mapper);
 		} else {
 			switch (_kind) {
-				case Timezone :
-					generator.write(((String) this._value));
-
-					break;
 				case Cron :
 					generator.write(((String) this._value));
 
@@ -347,12 +324,6 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
 		protected Builder self() {
 			return this;
 		}
-		public ObjectBuilder<Schedule> timezone(String v) {
-			this._kind = Kind.Timezone;
-			this._value = v;
-			return this;
-		}
-
 		public ObjectBuilder<Schedule> cron(String v) {
 			this._kind = Kind.Cron;
 			this._value = v;
@@ -416,7 +387,6 @@ public Schedule build() {
 
 	protected static void setupScheduleDeserializer(ObjectDeserializer<Builder> op) {
 
-		op.add(Builder::timezone, JsonpDeserializer.stringDeserializer(), "timezone");
 		op.add(Builder::cron, JsonpDeserializer.stringDeserializer(), "cron");
 		op.add(Builder::daily, DailySchedule._DESERIALIZER, "daily");
 		op.add(Builder::hourly, HourlySchedule._DESERIALIZER, "hourly");
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/ScheduleBuilders.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/ScheduleBuilders.java
index f69090877..6f70cced3 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/ScheduleBuilders.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/ScheduleBuilders.java
@@ -41,9 +41,9 @@
 /**
  * Builders for {@link Schedule} variants.
  * <p>
- * Variants <code>timezone</code>, <code>cron</code>, <code>monthly</code>,
- * <code>weekly</code>, <code>yearly</code> are not available here as they don't
- * have a dedicated class. Use {@link Schedule}'s builder for these.
+ * Variants <code>cron</code>, <code>monthly</code>, <code>weekly</code>,
+ * <code>yearly</code> are not available here as they don't have a dedicated
+ * class. Use {@link Schedule}'s builder for these.
  * 
  */
 public class ScheduleBuilders {