diff --git a/protos/generated/models/aggregated_models.proto b/protos/generated/models/aggregated_models.proto
index 217b40fda7f..515dcd0eb44 100644
--- a/protos/generated/models/aggregated_models.proto
+++ b/protos/generated/models/aggregated_models.proto
@@ -468,45 +468,6 @@ message AggregationRangeTo {
     NullValue null_value = 3;
   }
 }
-message Analyzer {
-  oneof analyzer {
-    CustomAnalyzer custom_analyzer = 1;
-
-    FingerprintAnalyzer fingerprint_analyzer = 2;
-
-    KeywordAnalyzer keyword_analyzer = 3;
-
-    LanguageAnalyzer language_analyzer = 4;
-
-    NoriAnalyzer nori_analyzer = 5;
-
-    PatternAnalyzer pattern_analyzer = 6;
-
-    SimpleAnalyzer simple_analyzer = 7;
-
-    StandardAnalyzer standard_analyzer = 8;
-
-    StopAnalyzer stop_analyzer = 9;
-
-    WhitespaceAnalyzer whitespace_analyzer = 10;
-
-    IcuAnalyzer icu_analyzer = 11;
-
-    KuromojiAnalyzer kuromoji_analyzer = 12;
-
-    SnowballAnalyzer snowball_analyzer = 13;
-
-    DutchAnalyzer dutch_analyzer = 14;
-
-    SmartcnAnalyzer smartcn_analyzer = 15;
-
-    CjkAnalyzer cjk_analyzer = 16;
-
-    PhoneAnalyzer phone_analyzer = 17;
-
-    PhoneSearchAnalyzer phone_search_analyzer = 18;
-  }
-}
 message ArrayPercentilesItem {
   string key = 1;
 
@@ -906,17 +867,6 @@ message ChildrenAggregation {
   // The name of a relation in a join field.
   optional string type = 5;
 }
-message CjkAnalyzer {
-  optional CjkAnalyzerType type = 1;
-
-  repeated string stopwords = 2;
-
-  optional string stopwords_path = 3;
-}
-enum CjkAnalyzerType {
-  CJK_ANALYZER_TYPE_UNSPECIFIED = 0;
-  CJK_ANALYZER_TYPE_CJK = 1;
-}
 message ClusterStatistics {
   int32 skipped = 1;
 
@@ -1298,23 +1248,6 @@ message CumulativeSumAggregation {
 
   optional GapPolicy gap_policy = 5;
 }
-message CustomAnalyzer {
-  CustomAnalyzerType type = 1;
-
-  repeated string char_filter = 2;
-
-  repeated string filter = 3;
-
-  optional int32 position_increment_gap = 4;
-
-  optional int32 position_offset_gap = 5;
-
-  string tokenizer = 6;
-}
-enum CustomAnalyzerType {
-  CUSTOM_ANALYZER_TYPE_UNSPECIFIED = 0;
-  CUSTOM_ANALYZER_TYPE_CUSTOM = 1;
-}
 message DateDecayPlacement {
   optional double decay = 1;
 
@@ -1554,6 +1487,21 @@ message DerivativeAggregation {
 
   optional GapPolicy gap_policy = 5;
 }
+message DerivedField {
+  string name = 1;
+
+  string type = 2;
+
+  Script script = 3;
+
+  optional string prefilter_field = 4;
+
+  optional ObjectMap properties = 5;
+
+  optional bool ignore_malformed = 6;
+
+  optional string format = 7;
+}
 message DirectGenerator {
   string field = 1;
 
@@ -1683,15 +1631,6 @@ message DoubleTermsBucket {
 
   optional string key_as_string = 4;
 }
-message DutchAnalyzer {
-  DutchAnalyzerType type = 1;
-
-  repeated string stopwords = 2;
-}
-enum DutchAnalyzerType {
-  DUTCH_ANALYZER_TYPE_UNSPECIFIED = 0;
-  DUTCH_ANALYZER_TYPE_DUTCH = 1;
-}
 message ErrorCause {
   // The type of error.
   string type = 1;
@@ -1707,6 +1646,10 @@ message ErrorCause {
   repeated ErrorCause root_cause = 5;
 
   repeated ErrorCause suppressed = 6;
+
+  repeated string header = 7;
+
+  optional ObjectMap metadata = 8;
 }
 message ErrorResponseBase {
   ErrorCause error = 1;
@@ -2067,8 +2010,6 @@ message FieldAndFormat {
 
   // Format in which the values are returned.
   optional string format = 2;
-
-  optional bool include_unmapped = 3;
 }
 message FieldCollapse {
   // The path to a field or an array of paths. Some APIs support wildcards in the path, which allows you to select multiple fields.
@@ -2268,25 +2209,6 @@ message FiltersAggregation {
 message FiltersBucket {
   int64 doc_count = 1;
 }
-message FingerprintAnalyzer {
-  FingerprintAnalyzerType type = 1;
-
-  optional string version = 2;
-
-  int32 max_output_size = 3;
-
-  bool preserve_original = 4;
-
-  string separator = 5;
-
-  repeated string stopwords = 6;
-
-  optional string stopwords_path = 7;
-}
-enum FingerprintAnalyzerType {
-  FINGERPRINT_ANALYZER_TYPE_UNSPECIFIED = 0;
-  FINGERPRINT_ANALYZER_TYPE_FINGERPRINT = 1;
-}
 message FloatMap {
   map<string, float> float_map = 1;
 }
@@ -2570,6 +2492,8 @@ message GeoDistanceSort {
   optional DistanceUnit unit = 6;
 
   optional GeoValidationMethod validation_method = 7;
+
+  map<string, GeoLocationArray> location = 8;
 }
 enum GeoDistanceType {
   GEO_DISTANCE_TYPE_UNSPECIFIED = 0;
@@ -2996,8 +2920,6 @@ message HighlightField {
 
   // A comma-separated list or a wildcard expression specifying the fields to include in the statistics. Used as the default list unless a specific field list is provided in the `completion_fields` or `fielddata_fields` parameters.
   repeated string matched_fields = 23;
-
-  optional Analyzer analyzer = 24;
 }
 enum HighlighterEncoder {
   HIGHLIGHTER_ENCODER_UNSPECIFIED = 0;
@@ -3300,28 +3222,6 @@ message HybridQuery {
 
   optional int32 pagination_depth = 4;
 }
-message IcuAnalyzer {
-  IcuAnalyzerType type = 1;
-
-  IcuNormalizationType method = 2;
-
-  IcuNormalizationMode mode = 3;
-}
-enum IcuAnalyzerType {
-  ICU_ANALYZER_TYPE_UNSPECIFIED = 0;
-  ICU_ANALYZER_TYPE_ICU_ANALYZER = 1;
-}
-enum IcuNormalizationMode {
-  ICU_NORMALIZATION_MODE_UNSPECIFIED = 0;
-  ICU_NORMALIZATION_MODE_COMPOSE = 1;
-  ICU_NORMALIZATION_MODE_DECOMPOSE = 2;
-}
-enum IcuNormalizationType {
-  ICU_NORMALIZATION_TYPE_UNSPECIFIED = 0;
-  ICU_NORMALIZATION_TYPE_NFC = 1;
-  ICU_NORMALIZATION_TYPE_NFKC = 2;
-  ICU_NORMALIZATION_TYPE_NFKC_CF = 3;
-}
 message IdsQuery {
   // Floating point number used to decrease or increase the relevance scores of the query. Boost values are relative to the default value of 1.0. A boost value between 0 and 1.0 decreases the relevance score. A value greater than 1.0 increases the relevance score.
   optional float boost = 1;
@@ -3374,9 +3274,11 @@ message InlineGetDictUserDefined {
 
   // The source of the document.
   optional ObjectMap x_source = 6;
+
+  optional ObjectMap metadata_fields = 7;
 }
 message InlineScript {
-  // Specifies any named parameters that are passed into the script as variables.  Use parameters instead of hard-coded values to decrease compilation time.
+  // Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to decrease compilation time.
   optional ObjectMap params = 1;
 
   optional ScriptLanguage lang = 2;
@@ -3410,8 +3312,7 @@ message InnerHits {
 
   optional bool seq_no_primary_term = 10;
 
-  // A comma-separated list or a wildcard expression specifying the fields to include in the statistics. Used as the default list unless a specific field list is provided in the `completion_fields` or `fielddata_fields` parameters.
-  repeated string fields = 11;
+  repeated FieldAndFormat fields = 11;
 
   repeated SortCombinations sort = 12;
 
@@ -3617,15 +3518,6 @@ message KeyedPercentilesValue {
 message KeyedPercentilesValueMap {
   map<string, KeyedPercentilesValue> keyed_percentiles_value_map = 1;
 }
-message KeywordAnalyzer {
-  KeywordAnalyzerType type = 1;
-
-  optional string version = 2;
-}
-enum KeywordAnalyzerType {
-  KEYWORD_ANALYZER_TYPE_UNSPECIFIED = 0;
-  KEYWORD_ANALYZER_TYPE_KEYWORD = 1;
-}
 message KnnQuery {
   // Floating point number used to decrease or increase the relevance scores of the query. Boost values are relative to the default value of 1.0. A boost value between 0 and 1.0 decreases the relevance score. A value greater than 1.0 increases the relevance score.
   optional float boost = 1;
@@ -3661,77 +3553,6 @@ message KnnQueryRescore {
     RescoreContext context = 2;
   }
 }
-message KuromojiAnalyzer {
-  KuromojiAnalyzerType type = 1;
-
-  KuromojiTokenizationMode mode = 2;
-
-  optional string user_dictionary = 3;
-}
-enum KuromojiAnalyzerType {
-  KUROMOJI_ANALYZER_TYPE_UNSPECIFIED = 0;
-  KUROMOJI_ANALYZER_TYPE_KUROMOJI = 1;
-}
-enum KuromojiTokenizationMode {
-  KUROMOJI_TOKENIZATION_MODE_UNSPECIFIED = 0;
-  KUROMOJI_TOKENIZATION_MODE_EXTENDED = 1;
-  KUROMOJI_TOKENIZATION_MODE_NORMAL = 2;
-  KUROMOJI_TOKENIZATION_MODE_SEARCH = 3;
-}
-enum Language {
-  LANGUAGE_UNSPECIFIED = 0;
-  LANGUAGE_ARABIC = 1;
-  LANGUAGE_ARMENIAN = 2;
-  LANGUAGE_BASQUE = 3;
-  LANGUAGE_BRAZILIAN = 4;
-  LANGUAGE_BULGARIAN = 5;
-  LANGUAGE_CATALAN = 6;
-  LANGUAGE_CHINESE = 7;
-  LANGUAGE_CJK = 8;
-  LANGUAGE_CZECH = 9;
-  LANGUAGE_DANISH = 10;
-  LANGUAGE_DUTCH = 11;
-  LANGUAGE_ENGLISH = 12;
-  LANGUAGE_ESTONIAN = 13;
-  LANGUAGE_FINNISH = 14;
-  LANGUAGE_FRENCH = 15;
-  LANGUAGE_GALICIAN = 16;
-  LANGUAGE_GERMAN = 17;
-  LANGUAGE_GREEK = 18;
-  LANGUAGE_HINDI = 19;
-  LANGUAGE_HUNGARIAN = 20;
-  LANGUAGE_INDONESIAN = 21;
-  LANGUAGE_IRISH = 22;
-  LANGUAGE_ITALIAN = 23;
-  LANGUAGE_LATVIAN = 24;
-  LANGUAGE_NORWEGIAN = 25;
-  LANGUAGE_PERSIAN = 26;
-  LANGUAGE_PORTUGUESE = 27;
-  LANGUAGE_ROMANIAN = 28;
-  LANGUAGE_RUSSIAN = 29;
-  LANGUAGE_SORANI = 30;
-  LANGUAGE_SPANISH = 31;
-  LANGUAGE_SWEDISH = 32;
-  LANGUAGE_THAI = 33;
-  LANGUAGE_TURKISH = 34;
-}
-message LanguageAnalyzer {
-  LanguageAnalyzerType type = 1;
-
-  optional string version = 2;
-
-  Language language = 3;
-
-  repeated string stem_exclusion = 4;
-
-  repeated string stopwords = 5;
-
-  optional string stopwords_path = 6;
-}
-enum LanguageAnalyzerType {
-  LANGUAGE_ANALYZER_TYPE_UNSPECIFIED = 0;
-  LANGUAGE_ANALYZER_TYPE_LANGUAGE = 1;
-}
 message LaplaceSmoothingModel {
   double alpha = 1;
 }
@@ -4723,27 +4544,6 @@ message NeuralQuery {
 
   string field = 10;
 }
-message NoriAnalyzer {
-  NoriAnalyzerType type = 1;
-
-  optional string version = 2;
-
-  optional NoriDecompoundMode decompound_mode = 3;
-
-  repeated string stoptags = 4;
-
-  optional string user_dictionary = 5;
-}
-enum NoriAnalyzerType {
-  NORI_ANALYZER_TYPE_UNSPECIFIED = 0;
-  NORI_ANALYZER_TYPE_NORI = 1;
-}
-enum NoriDecompoundMode {
-  NORI_DECOMPOUND_MODE_UNSPECIFIED = 0;
-  NORI_DECOMPOUND_MODE_DISCARD = 1;
-  NORI_DECOMPOUND_MODE_MIXED = 2;
-  NORI_DECOMPOUND_MODE_NONE = 3;
-}
 message NormalizeAggregation {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
@@ -4899,23 +4699,6 @@ message ParentIdQuery {
   // The name of a relation in a join field.
   optional string type = 5;
 }
-message PatternAnalyzer {
-  PatternAnalyzerType type = 1;
-
-  optional string version = 2;
-
-  optional string flags = 3;
-
-  optional bool lowercase = 4;
-
-  string pattern = 5;
-
-  repeated string stopwords = 6;
-}
-enum PatternAnalyzerType {
-  PATTERN_ANALYZER_TYPE_UNSPECIFIED = 0;
-  PATTERN_ANALYZER_TYPE_PATTERN = 1;
-}
 message PercentileRanksAggregation {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
@@ -5050,30 +4833,6 @@ message PhaseTook {
   // The time taken for the `can_match` phase.
   int64 can_match = 6;
 }
-message PhoneAnalyzer {
-  // Optional ISO 3166 country code, defaults to \"ZZ\" (unknown region).
-  optional string phone_region = 1 [json_name = "phone-region"];
-
-  PhoneAnalyzerAllOfType type = 2;
-}
-enum PhoneAnalyzerAllOfType {
-  PHONE_ANALYZER_ALL_OF_TYPE_UNSPECIFIED = 0;
-  PHONE_ANALYZER_ALL_OF_TYPE_PHONE = 1;
-}
-message PhoneAnalyzerBase {
-  // Optional ISO 3166 country code, defaults to \"ZZ\" (unknown region).
-  optional string phone_region = 1 [json_name = "phone-region"];
-}
-message PhoneSearchAnalyzer {
-  // Optional ISO 3166 country code, defaults to \"ZZ\" (unknown region).
-  optional string phone_region = 1 [json_name = "phone-region"];
-
-  PhoneSearchAnalyzerAllOfType type = 2;
-}
-enum PhoneSearchAnalyzerAllOfType {
-  PHONE_SEARCH_ANALYZER_ALL_OF_TYPE_UNSPECIFIED = 0;
-  PHONE_SEARCH_ANALYZER_ALL_OF_TYPE_PHONE_SEARCH = 1;
-}
 message PhraseSuggest {
   int32 length = 1;
 
@@ -5817,7 +5576,7 @@ message Script {
   }
 }
 message ScriptBase {
-  // Specifies any named parameters that are passed into the script as variables.  Use parameters instead of hard-coded values to decrease compilation time.
+  // Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to decrease compilation time.
   optional ObjectMap params = 1;
 }
 message ScriptField {
@@ -5955,52 +5714,63 @@ message SearchRequest {
   // Set to `true` to return detailed timing information about the execution of individual components in a search request. NOTE: This is a debugging tool and adds significant overhead to search execution.
   optional bool profile = 13;
 
-  optional QueryContainer query = 14;
+  // Customizable sequence of processing stages applied to search queries.
+  optional string search_pipeline = 14;
+
+  // Enables or disables verbose mode for the search pipeline.
+  optional bool verbose_pipeline = 15;
+
+  optional QueryContainer query = 16;
 
   // Can be used to improve precision by reordering just the top (for example 100 - 500) documents returned by the `query` and `post_filter` phases.
-  repeated Rescore rescore = 15;
+  repeated Rescore rescore = 17;
 
   // Retrieve a script evaluation (based on different fields) for each hit.
-  map<string, ScriptField> script_fields = 16;
+  map<string, ScriptField> script_fields = 18;
 
-  repeated FieldValue search_after = 17;
+  repeated FieldValue search_after = 19;
 
   // The number of hits to return. By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters. To page through more hits, use the `search_after` parameter.
-  optional int32 size = 18;
+  optional int32 size = 20;
 
-  optional SlicedScroll slice = 19;
+  optional SlicedScroll slice = 21;
 
-  repeated SortCombinations sort = 20;
+  repeated SortCombinations sort = 22;
 
   // Array of wildcard (`*`) patterns. The request returns values for field names matching these patterns in the `hits.fields` property of the response.
-  repeated FieldAndFormat fields = 21;
+  repeated FieldAndFormat fields = 23;
 
-  optional Suggester suggest = 22;
+  optional Suggester suggest = 24;
 
   // Maximum number of documents to collect for each shard. If a query reaches this limit, OpenSearch terminates the query early. OpenSearch collects documents before sorting. Use with caution. OpenSearch applies this parameter to each shard handling the request. When possible, let OpenSearch perform early termination automatically. Avoid specifying this parameter for requests that target data streams with backing indexes across multiple data tiers. If set to `0` (default), the query does not terminate early.
-  optional int32 terminate_after = 23;
+  optional int32 terminate_after = 25;
 
   // Specifies the period of time to wait for a response from each shard. If no response is received before the timeout expires, the request fails and returns an error. Defaults to no timeout.
-  optional string timeout = 24;
+  optional string timeout = 26;
 
   // If `true`, calculate and return document scores, even if the scores are not used for sorting.
-  optional bool track_scores = 25;
+  optional bool track_scores = 27;
+
+  // Whether to return scores with named queries. Default is false.
+  optional bool include_named_queries_score = 28;
 
   // If `true`, returns document version as part of a hit.
-  optional bool version = 26;
+  optional bool version = 29;
 
   // If `true`, returns sequence number and primary term of the last modification of each hit.
-  optional bool seq_no_primary_term = 27;
+  optional bool seq_no_primary_term = 30;
 
   // A comma-separated list or a wildcard expression specifying the fields to include in the statistics. Used as the default list unless a specific field list is provided in the `completion_fields` or `fielddata_fields` parameters.
-  repeated string stored_fields = 28;
+  repeated string stored_fields = 31;
 
-  optional PointInTimeReference pit = 29;
+  optional PointInTimeReference pit = 32;
 
   // Stats groups to associate with the search. Each group maintains a statistics aggregation for its associated searches. You can retrieve these stats using the indexes stats API.
-  repeated string stats = 30;
+  repeated string stats = 33;
 
-  optional SourceConfig x_source = 31;
+  map<string, DerivedField> derived = 34;
+
+  optional SourceConfig x_source = 35;
 }
 message SearchResponse {
   int64 took = 1;
@@ -6102,6 +5872,8 @@ message ShardFailure {
   int32 shard = 4;
 
   optional string status = 5;
+
+  optional bool primary = 6;
 }
 message ShardInfo {
   int32 failed = 1;
@@ -6342,15 +6114,6 @@ message SignificantTextAggregation {
   // A comma-separated list or a wildcard expression specifying the fields to include in the statistics. Used as the default list unless a specific field list is provided in the `completion_fields` or `fielddata_fields` parameters.
   repeated string source_fields = 21;
 }
-message SimpleAnalyzer {
-  SimpleAnalyzerType type = 1;
-
-  optional string version = 2;
-}
-enum SimpleAnalyzerType {
-  SIMPLE_ANALYZER_TYPE_UNSPECIFIED = 0;
-  SIMPLE_ANALYZER_TYPE_SIMPLE = 1;
-}
 message SimpleMovingAverageAggregation {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
@@ -6485,13 +6248,6 @@ message SlicedScroll {
   // The maximum number of slices.
   int32 max = 3;
 }
-message SmartcnAnalyzer {
-  optional SmartcnAnalyzerType type = 1;
-}
-enum SmartcnAnalyzerType {
-  SMARTCN_ANALYZER_TYPE_UNSPECIFIED = 0;
-  SMARTCN_ANALYZER_TYPE_SMARTCN = 1;
-}
 message SmoothingModel {
   optional LaplaceSmoothingModel laplace = 1;
 
@@ -6499,44 +6255,6 @@ message SmoothingModel {
 
   optional StupidBackoffSmoothingModel stupid_backoff = 3;
 }
-message SnowballAnalyzer {
-  SnowballAnalyzerType type = 1;
-
-  optional string version = 2;
-
-  SnowballLanguage language = 3;
-
-  repeated string stopwords = 4;
-}
-enum SnowballAnalyzerType {
-  SNOWBALL_ANALYZER_TYPE_UNSPECIFIED = 0;
-  SNOWBALL_ANALYZER_TYPE_SNOWBALL = 1;
-}
-enum SnowballLanguage {
-  SNOWBALL_LANGUAGE_UNSPECIFIED = 0;
-  SNOWBALL_LANGUAGE_ARMENIAN = 1;
-  SNOWBALL_LANGUAGE_BASQUE = 2;
-  SNOWBALL_LANGUAGE_CATALAN = 3;
-  SNOWBALL_LANGUAGE_DANISH = 4;
-  SNOWBALL_LANGUAGE_DUTCH = 5;
-  SNOWBALL_LANGUAGE_ENGLISH = 6;
-  SNOWBALL_LANGUAGE_FINNISH = 7;
-  SNOWBALL_LANGUAGE_FRENCH = 8;
-  SNOWBALL_LANGUAGE_GERMAN = 9;
-  SNOWBALL_LANGUAGE_GERMAN2 = 10;
-  SNOWBALL_LANGUAGE_HUNGARIAN = 11;
-  SNOWBALL_LANGUAGE_ITALIAN = 12;
-  SNOWBALL_LANGUAGE_KP = 13;
-  SNOWBALL_LANGUAGE_LOVINS = 14;
-  SNOWBALL_LANGUAGE_NORWEGIAN = 15;
-  SNOWBALL_LANGUAGE_PORTER = 16;
-  SNOWBALL_LANGUAGE_PORTUGUESE = 17;
-  SNOWBALL_LANGUAGE_ROMANIAN = 18;
-  SNOWBALL_LANGUAGE_RUSSIAN = 19;
-  SNOWBALL_LANGUAGE_SPANISH = 20;
-  SNOWBALL_LANGUAGE_SWEDISH = 21;
-  SNOWBALL_LANGUAGE_TURKISH = 22;
-}
 message SortCombinations {
   oneof sort_combinations {
     // The path to a field or an array of paths. Some APIs support wildcards in the path, which allows you to select multiple fields.
@@ -6623,9 +6341,7 @@ message SpanFirstQuery {
   SpanQuery match = 4;
 }
 message SpanGapQuery {
-  string field = 1;
-
-  optional int32 span_width = 2;
+  map<string, int32> span_width = 1;
 }
 message SpanMultiTermQuery {
   // Floating point number used to decrease or increase the relevance scores of the query. Boost values are relative to the default value of 1.0. A boost value between 0 and 1.0 decreases the relevance score. A value greater than 1.0 increases the relevance score.
@@ -6720,17 +6436,6 @@ message SpanWithinQuery {
 
   SpanQuery little = 4;
 }
-message StandardAnalyzer {
-  StandardAnalyzerType type = 1;
-
-  optional int32 max_token_length = 2;
-
-  repeated string stopwords = 3;
-}
-enum StandardAnalyzerType {
-  STANDARD_ANALYZER_TYPE_UNSPECIFIED = 0;
-  STANDARD_ANALYZER_TYPE_STANDARD = 1;
-}
 message StandardDeviationBounds {
   StandardDeviationBoundsUpper upper = 1;
 
@@ -6914,21 +6619,8 @@ message StatsBucketAggregation {
 
   optional GapPolicy gap_policy = 5;
 }
-message StopAnalyzer {
-  StopAnalyzerType type = 1;
-
-  optional string version = 2;
-
-  repeated string stopwords = 3;
-
-  optional string stopwords_path = 4;
-}
-enum StopAnalyzerType {
-  STOP_ANALYZER_TYPE_UNSPECIFIED = 0;
-  STOP_ANALYZER_TYPE_STOP = 1;
-}
 message StoredScriptId {
-  // Specifies any named parameters that are passed into the script as variables.  Use parameters instead of hard-coded values to decrease compilation time.
+  // Specifies any named parameters that are passed into the script as variables. Use parameters instead of hard-coded values to decrease compilation time.
   optional ObjectMap params = 1;
 
   // The unique identifier for a resource.
@@ -7030,6 +6722,8 @@ enum SuggestSort {
 message Suggester {
   // The global suggest text, which avoids repetition when the same text is used in several suggesters.
   optional string text = 1;
+
+  map<string, FieldSuggester> suggesters = 2;
 }
 message SuggesterBase {
   optional string analyzer = 1;
@@ -7715,15 +7409,6 @@ message WeightedAvgAggregate {
 
   optional string value_as_string = 3;
 }
-message WhitespaceAnalyzer {
-  WhitespaceAnalyzerType type = 1;
-
-  optional string version = 2;
-}
-enum WhitespaceAnalyzerType {
-  WHITESPACE_ANALYZER_TYPE_UNSPECIFIED = 0;
-  WHITESPACE_ANALYZER_TYPE_WHITESPACE = 1;
-}
 message WildcardQuery {
   // Floating point number used to decrease or increase the relevance scores of the query. Boost values are relative to the default value of 1.0. A boost value between 0 and 1.0 decreases the relevance score. A value greater than 1.0 increases the relevance score.
   optional float boost = 1;