diff --git a/protos/generated/models/aggregated_models.proto b/protos/generated/models/aggregated_models.proto
index a7552f12fc1..0fe5677ec4b 100644
--- a/protos/generated/models/aggregated_models.proto
+++ b/protos/generated/models/aggregated_models.proto
@@ -367,14 +367,11 @@ message AggregationProfile {
 
   string description = 2;
 
-  // Time unit for nanoseconds.
-  int64 time_in_nanos = 3;
+  string type = 3;
 
-  string type = 4;
+  optional AggregationProfileDebug debug = 4;
 
-  optional AggregationProfileDebug debug = 5;
-
-  repeated AggregationProfile children = 6;
+  repeated AggregationProfile children = 5;
 }
 message AggregationProfileDebug {
   optional int32 segments_with_multi_valued_ords = 1;
@@ -518,6 +515,7 @@ message AutoDateHistogramAggregation {
 
   optional MinimumInterval minimum_interval = 8;
 
+  // A date and time, either as a string whose format depends on the context (defaulting to ISO_8601) or the number of milliseconds since the epoch. OpenSearch accepts both as an input but will generally output a string. representation.
   optional string missing = 9;
 
   // Time zone specified as a ISO 8601 UTC offset.
@@ -776,7 +774,7 @@ message BulkRequestBody {
 message BulkResponse {
   bool errors = 1;
 
-  repeated Item items = 2;
+  repeated Items items = 2;
 
   int64 took = 3;
 
@@ -880,10 +878,7 @@ message Collector {
 
   string reason = 2;
 
-  // Time unit for nanoseconds.
-  int64 time_in_nanos = 3;
-
-  repeated Collector children = 4;
+  repeated Collector children = 3;
 }
 enum CombinedFieldsOperator {
   COMBINED_FIELDS_OPERATOR_UNSPECIFIED = 0;
@@ -1252,6 +1247,7 @@ message DateDecayPlacement {
   // A duration. Units can be `nanos`, `micros`, `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours) and `d` (days). Also accepts `0` without a unit and `-1` to indicate an unspecified value.
   optional string offset = 2;
 
+  // A date and time, either as a string whose format depends on the context (defaulting to ISO_8601) or the number of milliseconds since the epoch. OpenSearch accepts both as an input but will generally output a string. representation.
   optional string origin = 3;
 
   // A duration. Units can be `nanos`, `micros`, `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours) and `d` (days). Also accepts `0` without a unit and `-1` to indicate an unspecified value.
@@ -1296,6 +1292,7 @@ message DateHistogramAggregation {
   // Only returns buckets that have `min_doc_count` number of documents. By default, all buckets between the first bucket that matches documents and the last one are returned.
   optional int32 min_doc_count = 12;
 
+  // A date and time, either as a string whose format depends on the context (defaulting to ISO_8601) or the number of milliseconds since the epoch. OpenSearch accepts both as an input but will generally output a string. representation.
   optional string missing = 13;
 
   // A duration. Units can be `nanos`, `micros`, `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours) and `d` (days). Also accepts `0` without a unit and `-1` to indicate an unspecified value.
@@ -1317,9 +1314,6 @@ message DateHistogramBucket {
   int64 doc_count = 1;
 
   optional string key_as_string = 2;
-
-  // The time unit for milliseconds.
-  int64 key = 3;
 }
 message DateRangeAggregate {
   // The custom metadata attached to a resource.
@@ -1412,14 +1406,6 @@ message DateRangeQueryAllOfTo {
     NullValue null_value = 2;
   }
 }
-message DateTime {
-  oneof date_time {
-    string string = 1;
-
-    // The time unit for milliseconds.
-    int64 int64 = 2;
-  }
-}
 enum Day {
   DAY_UNSPECIFIED = 0;
   DAY_DAY = 1;
@@ -1962,14 +1948,11 @@ message FetchProfile {
 
   string description = 2;
 
-  // Time unit for nanoseconds.
-  int64 time_in_nanos = 3;
-
-  FetchProfileBreakdown breakdown = 4;
+  FetchProfileBreakdown breakdown = 3;
 
-  optional FetchProfileDebug debug = 5;
+  optional FetchProfileDebug debug = 4;
 
-  repeated FetchProfile children = 6;
+  repeated FetchProfile children = 5;
 }
 message FetchProfileBreakdown {
   optional int32 load_source = 1;
@@ -2065,11 +2048,11 @@ message FieldSuggester {
 
   optional string text = 3;
 
-  optional CompletionSuggester completion = 4;
-
-  optional PhraseSuggester phrase = 5;
-
-  optional TermSuggester term = 6;
+  oneof field_suggester {
+    CompletionSuggester completion = 4;
+    PhraseSuggester phrase = 5;
+    TermSuggester term = 6;
+  }
 }
 enum FieldType {
   FIELD_TYPE_UNSPECIFIED = 0;
@@ -3347,36 +3330,27 @@ message IntervalsAnyOf {
   optional IntervalsFilter filter = 2;
 }
 message IntervalsContainer {
-  optional IntervalsAllOf all_of = 1;
-
-  optional IntervalsAnyOf any_of = 2;
-
-  optional IntervalsFuzzy fuzzy = 3;
-
-  optional IntervalsMatch match = 4;
-
-  optional IntervalsPrefix prefix = 5;
-
-  optional IntervalsWildcard wildcard = 6;
+  oneof intervals_container {
+    IntervalsAllOf all_of = 1;
+    IntervalsAnyOf any_of = 2;
+    IntervalsFuzzy fuzzy = 3;
+    IntervalsMatch match = 4;
+    IntervalsPrefix prefix = 5;
+    IntervalsWildcard wildcard = 6;
+  }
 }
 message IntervalsFilter {
-  optional IntervalsContainer after = 1;
-
-  optional IntervalsContainer before = 2;
-
-  optional IntervalsContainer contained_by = 3;
-
-  optional IntervalsContainer containing = 4;
-
-  optional IntervalsContainer not_contained_by = 5;
-
-  optional IntervalsContainer not_containing = 6;
-
-  optional IntervalsContainer not_overlapping = 7;
-
-  optional IntervalsContainer overlapping = 8;
-
-  optional Script script = 9;
+  oneof intervals_filter {
+    IntervalsContainer after = 1;
+    IntervalsContainer before = 2;
+    IntervalsContainer contained_by = 3;
+    IntervalsContainer containing = 4;
+    IntervalsContainer not_contained_by = 5;
+    IntervalsContainer not_containing = 6;
+    IntervalsContainer not_overlapping = 7;
+    IntervalsContainer overlapping = 8;
+    Script script = 9;
+  }
 }
 message IntervalsFuzzy {
   // Analyzer used to normalize the term.
@@ -3430,19 +3404,16 @@ message IntervalsQuery {
 
   optional string x_name = 2;
 
-  optional IntervalsAllOf all_of = 3;
-
-  optional IntervalsAnyOf any_of = 4;
-
-  optional IntervalsFuzzy fuzzy = 5;
-
-  optional IntervalsMatch match = 6;
-
-  optional IntervalsPrefix prefix = 7;
-
-  optional IntervalsWildcard wildcard = 8;
-
   string field = 9;
+
+  oneof intervals_query {
+    IntervalsAllOf all_of = 3;
+    IntervalsAnyOf any_of = 4;
+    IntervalsFuzzy fuzzy = 5;
+    IntervalsMatch match = 6;
+    IntervalsPrefix prefix = 7;
+    IntervalsWildcard wildcard = 8;
+  }
 }
 message IntervalsWildcard {
   // Analyzer used to analyze the `pattern`. Defaults to the top-level field's analyzer.
@@ -3497,14 +3468,13 @@ message IpRangeBucket {
 
   optional string to = 4;
 }
-message Item {
-  optional ResponseItem index = 1;
-
-  optional ResponseItem create = 2;
-
-  optional ResponseItem update = 3;
-
-  optional ResponseItem delete = 4;
+message Items {
+  oneof items {
+    ResponseItem index = 1;
+    ResponseItem create = 2;
+    ResponseItem update = 3;
+    ResponseItem delete = 4;
+  }
 }
 message KeyedPercentilesValue {
   oneof keyed_percentiles_value {
@@ -3762,34 +3732,32 @@ message MatchQuery {
   // If `true`, match phrase queries are automatically created for multi-term synonyms.
   optional bool auto_generate_synonyms_phrase_query = 4;
 
-  optional float cutoff_frequency = 5;
-
-  optional Fuzziness fuzziness = 6;
+  optional Fuzziness fuzziness = 5;
 
-  optional MultiTermQueryRewrite fuzzy_rewrite = 7;
+  optional MultiTermQueryRewrite fuzzy_rewrite = 6;
 
   // If `true`, edits for fuzzy matching include transpositions of two adjacent characters (for example, `ab` to `ba`).
-  optional bool fuzzy_transpositions = 8;
+  optional bool fuzzy_transpositions = 7;
 
   // If `true`, format-based errors, such as providing a text query value for a numeric field, are ignored.
-  optional bool lenient = 9;
+  optional bool lenient = 8;
 
   // Maximum number of terms to which the query will expand.
-  optional int32 max_expansions = 10;
+  optional int32 max_expansions = 9;
 
-  optional MinimumShouldMatch minimum_should_match = 11;
+  optional MinimumShouldMatch minimum_should_match = 10;
 
-  optional Operator operator = 12;
+  optional Operator operator = 11;
 
   // Number of beginning characters left unchanged for fuzzy matching.
-  optional int32 prefix_length = 13;
+  optional int32 prefix_length = 12;
 
   // Text, number, Boolean value or date you wish to find in the provided field.
-  FieldValue query = 14;
+  FieldValue query = 13;
 
-  optional ZeroTermsQuery zero_terms_query = 15;
+  optional ZeroTermsQuery zero_terms_query = 14;
 
-  string field = 16;
+  string field = 15;
 }
 message MatrixAggregation {
   // The custom metadata attached to a resource.
@@ -4648,13 +4616,12 @@ message OperationBase {
   optional string x_index = 3;
 }
 message OperationContainer {
-  optional IndexOperation index = 1;
-
-  optional WriteOperation create = 2;
-
-  optional UpdateOperation update = 3;
-
-  optional DeleteOperation delete = 4;
+  oneof operation_container {
+    IndexOperation index = 1;
+    WriteOperation create = 2;
+    UpdateOperation update = 3;
+    DeleteOperation delete = 4;
+  }
 }
 enum Operator {
   OPERATOR_UNSPECIFIED = 0;
@@ -4901,26 +4868,6 @@ message PhraseSuggester {
 
   optional int32 token_limit = 16;
 }
-message PinnedDoc {
-  // The unique identifier for a resource.
-  string x_id = 1;
-
-  string x_index = 2;
-}
-message PinnedQuery {
-  // 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;
-
-  optional string x_name = 2;
-
-  QueryContainer organic = 3;
-
-  // Document IDs listed in the order they are to appear in results. Required if `docs` is not specified.
-  repeated string ids = 4;
-
-  // Documents listed in the order they are to appear in results. Required if `ids` is not specified.
-  repeated PinnedDoc docs = 5;
-}
 message PipelineAggregationBase {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
@@ -5024,148 +4971,89 @@ message QueryBreakdown {
   int64 set_min_competitive_score_count = 18;
 }
 message QueryContainer {
-  optional BoolQuery bool = 1;
-
-  optional BoostingQuery boosting = 2;
-
-  optional CommonTermsQuery common = 3;
-
-  optional CombinedFieldsQuery combined_fields = 4;
-
-  optional ConstantScoreQuery constant_score = 5;
-
-  optional DisMaxQuery dis_max = 6;
-
-  optional DistanceFeatureQuery distance_feature = 7;
-
-  optional ExistsQuery exists = 8;
-
-  optional FunctionScoreQuery function_score = 9;
-
-  // Returns documents that contain terms similar to the search term, as measured by a Levenshtein edit distance.
-  optional FuzzyQuery fuzzy = 10;
-
-  optional GeoBoundingBoxQuery geo_bounding_box = 11;
-
-  optional GeoDistanceQuery geo_distance = 12;
-
-  optional GeoPolygonQuery geo_polygon = 13;
-
-  optional GeoShapeQuery geo_shape = 14;
-
-  optional HasChildQuery has_child = 15;
-
-  optional HasParentQuery has_parent = 16;
-
-  optional HybridQuery hybrid = 17;
-
-  optional IdsQuery ids = 18;
-
-  // Returns documents based on the order and proximity of matching terms.
-  optional IntervalsQuery intervals = 19;
-
-  optional KnnQuery knn = 20;
-
-  // Returns documents that match a provided text, number, date or Boolean value. The provided text is analyzed before matching.
-  optional MatchQuery match = 21;
-
-  optional MatchAllQuery match_all = 22;
-
-  // Analyzes its input and constructs a `bool` query from the terms. Each term except the last is used in a `term` query. The last term is used in a prefix query.
-  optional MatchBoolPrefixQuery match_bool_prefix = 23;
-
-  optional MatchNoneQuery match_none = 24;
-
-  // Analyzes the text and creates a phrase query out of the analyzed text.
-  optional MatchPhraseQuery match_phrase = 25;
-
-  // Returns documents that contain the words of a provided text, in the same order as provided. The last term of the provided text is treated as a prefix, matching any words that begin with that term.
-  optional MatchPhrasePrefixQuery match_phrase_prefix = 26;
-
-  optional MoreLikeThisQuery more_like_this = 27;
-
-  optional MultiMatchQuery multi_match = 28;
-
-  optional NestedQuery nested = 29;
-
-  optional NeuralQuery neural = 30;
-
-  optional ParentIdQuery parent_id = 31;
-
-  optional PercolateQuery percolate = 32;
-
-  optional PinnedQuery pinned = 33;
-
-  // Returns documents that contain a specific prefix in a provided field.
-  optional PrefixQuery prefix = 34;
-
-  optional QueryStringQuery query_string = 35;
-
-  // Returns documents that contain terms within a provided range.
-  optional RangeQuery range = 36;
-
-  optional RankFeatureQuery rank_feature = 37;
-
-  // Returns documents that contain terms matching a regular expression.
-  optional RegexpQuery regexp = 38;
-
-  optional ScriptQuery script = 39;
-
-  optional ScriptScoreQuery script_score = 40;
-
-  optional SimpleQueryStringQuery simple_query_string = 41;
-
-  optional SpanContainingQuery span_containing = 42;
-
-  optional SpanFieldMaskingQuery field_masking_span = 43;
-
-  optional SpanFirstQuery span_first = 44;
-
-  optional SpanMultiTermQuery span_multi = 45;
-
-  optional SpanNearQuery span_near = 46;
-
-  optional SpanNotQuery span_not = 47;
-
-  optional SpanOrQuery span_or = 48;
-
-  // Matches spans containing a term.
-  optional SpanTermQuery span_term = 49;
-
-  optional SpanWithinQuery span_within = 50;
-
-  // Return documents using a template query contains placeholders that are resolved by search request processors during query execution.
-  optional ObjectMap template = 51;
-
-  // Returns documents that contain an exact term in a provided field. To return a document, the query term must exactly match the queried field's value, including white space and capitalization.
-  optional TermQuery term = 52;
-
-  // Returns documents that contain one or more exact terms in a provided field.
-  optional TermsQuery terms = 53;
-
-  // Returns documents that contain a minimum number of exact terms in a provided field. To return a document, a required number of terms must exactly match the field values, including white space and capitalization.
-  optional TermsSetQuery terms_set = 54;
-
-  optional TypeQuery type = 55;
-
-  // Returns documents that contain terms matching a wildcard pattern.
-  optional WildcardQuery wildcard = 56;
-
-  optional WrapperQuery wrapper = 57;
-
-  optional XyShapeQuery xy_shape = 58;
+  oneof query_container {
+    BoolQuery bool = 1;
+    BoostingQuery boosting = 2;
+    CommonTermsQuery common = 3;
+    CombinedFieldsQuery combined_fields = 4;
+    ConstantScoreQuery constant_score = 5;
+    DisMaxQuery dis_max = 6;
+    DistanceFeatureQuery distance_feature = 7;
+    ExistsQuery exists = 8;
+    FunctionScoreQuery function_score = 9;
+    // Returns documents that contain terms similar to the search term, as measured by a Levenshtein edit distance.
+    FuzzyQuery fuzzy = 10;
+    GeoBoundingBoxQuery geo_bounding_box = 11;
+    GeoDistanceQuery geo_distance = 12;
+    GeoPolygonQuery geo_polygon = 13;
+    GeoShapeQuery geo_shape = 14;
+    HasChildQuery has_child = 15;
+    HasParentQuery has_parent = 16;
+    HybridQuery hybrid = 17;
+    IdsQuery ids = 18;
+    // Returns documents based on the order and proximity of matching terms.
+    IntervalsQuery intervals = 19;
+    KnnQuery knn = 20;
+    // Returns documents that match a provided text, number, date or Boolean value. The provided text is analyzed before matching.
+    MatchQuery match = 21;
+    MatchAllQuery match_all = 22;
+    // Analyzes its input and constructs a `bool` query from the terms. Each term except the last is used in a `term` query. The last term is used in a prefix query.
+    MatchBoolPrefixQuery match_bool_prefix = 23;
+    MatchNoneQuery match_none = 24;
+    // Analyzes the text and creates a phrase query out of the analyzed text.
+    MatchPhraseQuery match_phrase = 25;
+    // Returns documents that contain the words of a provided text, in the same order as provided. The last term of the provided text is treated as a prefix, matching any words that begin with that term.
+    MatchPhrasePrefixQuery match_phrase_prefix = 26;
+    MoreLikeThisQuery more_like_this = 27;
+    MultiMatchQuery multi_match = 28;
+    NestedQuery nested = 29;
+    NeuralQuery neural = 30;
+    ParentIdQuery parent_id = 31;
+    PercolateQuery percolate = 32;
+    // Returns documents that contain a specific prefix in a provided field.
+    PrefixQuery prefix = 33;
+    QueryStringQuery query_string = 34;
+    // Returns documents that contain terms within a provided range.
+    RangeQuery range = 35;
+    RankFeatureQuery rank_feature = 36;
+    // Returns documents that contain terms matching a regular expression.
+    RegexpQuery regexp = 37;
+    ScriptQuery script = 38;
+    ScriptScoreQuery script_score = 39;
+    SimpleQueryStringQuery simple_query_string = 40;
+    SpanContainingQuery span_containing = 41;
+    SpanFieldMaskingQuery field_masking_span = 42;
+    SpanFirstQuery span_first = 43;
+    SpanMultiTermQuery span_multi = 44;
+    SpanNearQuery span_near = 45;
+    SpanNotQuery span_not = 46;
+    SpanOrQuery span_or = 47;
+    // Matches spans containing a term.
+    SpanTermQuery span_term = 48;
+    SpanWithinQuery span_within = 49;
+    // Return documents using a template query contains placeholders that are resolved by search request processors during query execution.
+    ObjectMap template = 50;
+    // Returns documents that contain an exact term in a provided field. To return a document, the query term must exactly match the queried field's value, including white space and capitalization.
+    TermQuery term = 51;
+    // Returns documents that contain one or more exact terms in a provided field.
+    TermsQuery terms = 52;
+    // Returns documents that contain a minimum number of exact terms in a provided field. To return a document, a required number of terms must exactly match the field values, including white space and capitalization.
+    TermsSetQuery terms_set = 53;
+    TypeQuery type = 54;
+    // Returns documents that contain terms matching a wildcard pattern.
+    WildcardQuery wildcard = 55;
+    WrapperQuery wrapper = 56;
+    XyShapeQuery xy_shape = 57;
+  }
 }
 message QueryProfile {
   QueryBreakdown breakdown = 1;
 
   string description = 2;
 
-  // Time unit for nanoseconds.
-  int64 time_in_nanos = 3;
-
-  string type = 4;
+  string type = 3;
 
-  repeated QueryProfile children = 5;
+  repeated QueryProfile children = 4;
 }
 message QueryStringQuery {
   // 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.
@@ -5873,7 +5761,7 @@ message ShardFailure {
 
   optional string status = 5;
 
-  bool primary = 6;
+  optional bool primary = 6;
 }
 message ShardInfo {
   int32 failed = 1;
@@ -6249,11 +6137,11 @@ message SlicedScroll {
   int32 max = 3;
 }
 message SmoothingModel {
-  optional LaplaceSmoothingModel laplace = 1;
-
-  optional LinearInterpolationSmoothingModel linear_interpolation = 2;
-
-  optional StupidBackoffSmoothingModel stupid_backoff = 3;
+  oneof smoothing_model {
+    LaplaceSmoothingModel laplace = 1;
+    LinearInterpolationSmoothingModel linear_interpolation = 2;
+    StupidBackoffSmoothingModel stupid_backoff = 3;
+  }
 }
 message SortCombinations {
   oneof sort_combinations {
@@ -6276,11 +6164,11 @@ enum SortMode {
   SORT_MODE_SUM = 5;
 }
 message SortOptions {
-  optional ScoreSort x_score = 1;
-
-  optional GeoDistanceSort x_geo_distance = 2;
-
-  optional ScriptSort x_script = 3;
+  oneof sort_options {
+    ScoreSort x_score = 1;
+    GeoDistanceSort x_geo_distance = 2;
+    ScriptSort x_script = 3;
+  }
 }
 enum SortOrder {
   SORT_ORDER_UNSPECIFIED = 0;
@@ -6400,26 +6288,19 @@ message SpanOrQuery {
   repeated SpanQuery clauses = 3;
 }
 message SpanQuery {
-  optional SpanContainingQuery span_containing = 1;
-
-  optional SpanFieldMaskingQuery field_masking_span = 2;
-
-  optional SpanFirstQuery span_first = 3;
-
-  optional SpanGapQuery span_gap = 4;
-
-  optional SpanMultiTermQuery span_multi = 5;
-
-  optional SpanNearQuery span_near = 6;
-
-  optional SpanNotQuery span_not = 7;
-
-  optional SpanOrQuery span_or = 8;
-
-  // The equivalent of the `term` query but for use with other span queries.
-  optional SpanTermQuery span_term = 9;
-
-  optional SpanWithinQuery span_within = 10;
+  oneof span_query {
+    SpanContainingQuery span_containing = 1;
+    SpanFieldMaskingQuery field_masking_span = 2;
+    SpanFirstQuery span_first = 3;
+    SpanGapQuery span_gap = 4;
+    SpanMultiTermQuery span_multi = 5;
+    SpanNearQuery span_near = 6;
+    SpanNotQuery span_not = 7;
+    SpanOrQuery span_or = 8;
+    // The equivalent of the `term` query but for use with other span queries.
+    SpanTermQuery span_term = 9;
+    SpanWithinQuery span_within = 10;
+  }
 }
 message SpanTermQuery {
   // 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.
@@ -7009,7 +6890,7 @@ message TermsAggregation {
   // Coerced unmapped fields into the specified type.
   optional string value_type = 14;
 
-  map<string, SortOrder> order = 15;
+  repeated SortOrderMap order = 15;
 
   optional Script script = 16;
 
diff --git a/protos/generated/services/default_service.proto b/protos/generated/services/default_service.proto
index 037516e2189..12e36407b15 100644
--- a/protos/generated/services/default_service.proto
+++ b/protos/generated/services/default_service.proto
@@ -9,19 +9,19 @@ package org.opensearch.protobufs.services;
 import "models/aggregated_models.proto";
 
 message BulkRequest {
-  repeated BulkRequestBody bulk_request_body = 1;
+  // Name of the data stream, index, or index alias to perform bulk actions on.
+  string index = 1;
+
+  repeated BulkRequestBody bulk_request_body = 2;
 
   // `true` or `false` to return the `_source` field or not, or a list of fields to return.
-  optional SourceConfigParam x_source = 2;
+  optional SourceConfigParam x_source = 3;
 
   // A comma-separated list of source fields to exclude from the response.
-  repeated string x_source_excludes = 3;
+  repeated string x_source_excludes = 4;
 
   // A comma-separated list of source fields to include in the response.
-  repeated string x_source_includes = 4;
-
-  // Name of the data stream, index, or index alias to perform bulk actions on.
-  optional string index = 5;
+  repeated string x_source_includes = 5;
 
   // ID of the pipeline to use to preprocess incoming documents. If the index has a default ingest pipeline specified, then setting the value to `_none` disables the default ingest pipeline for this request. If a final pipeline is configured it will always run, regardless of the value of this parameter.
   optional string pipeline = 6;
@@ -49,53 +49,53 @@ message BulkRequest {
 }
 
 message SearchRequest {
+  // A comma-separated list of data streams, indexes, and aliases to search. Supports wildcards (`*`). To search all data streams and indexes, omit this parameter or use `*` or `_all`.
+  repeated string index = 1;
+
   // Indicates which source fields are returned for matching documents. These fields are returned in the `hits._source` property of the search response. Valid values are: `true` to return the entire document source; `false` to not return the document source; `<string>` to return the source fields that are specified as a comma-separated list (supports wildcard (`*`) patterns).
-  optional SourceConfigParam x_source = 1;
+  optional SourceConfigParam x_source = 2;
 
   // A comma-separated list of source fields to exclude from the response. You can also use this parameter to exclude fields from the subset specified in `_source_includes` query parameter. If the `_source` parameter is `false`, this parameter is ignored.
-  repeated string x_source_excludes = 2;
+  repeated string x_source_excludes = 3;
 
   // A comma-separated list of source fields to include in the response. If this parameter is specified, only these source fields are returned. You can exclude fields from this subset using the `_source_excludes` query parameter. If the `_source` parameter is `false`, this parameter is ignored.
-  repeated string x_source_includes = 3;
+  repeated string x_source_includes = 4;
 
   // If `false`, the request returns an error if any wildcard expression, index alias, or `_all` value targets only missing or closed indexes. This behavior applies even if the request targets other open indexes. For example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.
-  optional bool allow_no_indices = 4;
+  optional bool allow_no_indices = 5;
 
   // If `true`, returns partial results if there are shard request timeouts or shard failures. If `false`, returns an error with no partial results.
-  optional bool allow_partial_search_results = 5;
+  optional bool allow_partial_search_results = 6;
 
   // If `true`, wildcard and prefix queries are analyzed. This parameter can only be used when the q query string parameter is specified.
-  optional bool analyze_wildcard = 6;
+  optional bool analyze_wildcard = 7;
 
   // The number of shard results that should be reduced at once on the coordinating node. This value should be used as a protection mechanism to reduce the memory overhead per search request if the potential number of shards in the request can be large.
-  optional int32 batched_reduce_size = 7;
+  optional int32 batched_reduce_size = 8;
 
   // The time after which the search request will be canceled. Request-level parameter takes precedence over `cancel_after_time_interval` cluster setting.
-  optional string cancel_after_time_interval = 8;
+  optional string cancel_after_time_interval = 9;
 
   // If `true`, network round-trips between the coordinating node and the remote clusters are minimized when executing cross-cluster search (CCS) requests.
-  optional bool ccs_minimize_roundtrips = 9;
+  optional bool ccs_minimize_roundtrips = 10;
 
   // The default operator for query string query: AND or OR. This parameter can only be used when the `q` query string parameter is specified.
-  optional Operator default_operator = 10;
+  optional Operator default_operator = 11;
 
   // Field to use as default where no field prefix is given in the query string. This parameter can only be used when the q query string parameter is specified.
-  optional string df = 11;
+  optional string df = 12;
 
   // A comma-separated list of fields to return as the docvalue representation for each hit.
-  repeated string docvalue_fields = 12;
+  repeated string docvalue_fields = 13;
 
   // Type of index that wildcard patterns can match. If the request can target data streams, this argument determines whether wildcard expressions match hidden data streams. Supports comma-separated values, such as `open,hidden`.
-  repeated ExpandWildcard expand_wildcards = 13;
+  repeated ExpandWildcard expand_wildcards = 14;
 
   // If `true`, concrete, expanded or aliased indexes will be ignored when frozen.
-  optional bool ignore_throttled = 14;
+  optional bool ignore_throttled = 15;
 
   // If `false`, the request returns an error if it targets a missing or closed index.
-  optional bool ignore_unavailable = 15;
-
-  // A comma-separated list of data streams, indexes, and aliases to search. Supports wildcards (`*`). To search all data streams and indexes, omit this parameter or use `*` or `_all`.
-  repeated string index = 16;
+  optional bool ignore_unavailable = 16;
 
   // Defines the number of concurrent shard requests per node this search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests.
   optional int32 max_concurrent_shard_requests = 17;
@@ -116,7 +116,7 @@ message SearchRequest {
   optional bool request_cache = 22;
 
   // Indicates whether `hits.total` should be rendered as an integer or an object in the rest search response.
-  optional bool total_hits_as_int = 23;
+  optional bool rest_total_hits_as_int = 23;
 
   // A custom value used to route operations to a specific shard.
   repeated string routing = 24;