diff --git a/protos/generated/models/aggregated_models.proto b/protos/generated/models/aggregated_models.proto
index 92833725d43..82eba8cb725 100644
--- a/protos/generated/models/aggregated_models.proto
+++ b/protos/generated/models/aggregated_models.proto
@@ -38,6 +38,11 @@ message GeneralNumber {
     double double_value = 4;
   }
 }
+
+enum NullValue {
+  NULL_VALUE_UNSPECIFIED = 0;
+  NULL_VALUE_NULL = 1;
+}
 message AdjacencyMatrixAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
@@ -450,6 +455,8 @@ message AggregationRangeFrom {
     double double = 1;
 
     string string = 2;
+
+    NullValue null_value = 3;
   }
 }
 message AggregationRangeTo {
@@ -457,6 +464,8 @@ message AggregationRangeTo {
     double double = 1;
 
     string string = 2;
+
+    NullValue null_value = 3;
   }
 }
 message Analyzer {
@@ -501,13 +510,20 @@ message Analyzer {
 message ArrayPercentilesItem {
   string key = 1;
 
-  optional double value = 2;
+  ArrayPercentilesItemValue value = 2;
 
   optional string value_as_string = 3;
 }
 message ArrayPercentilesItemArray {
   repeated ArrayPercentilesItem array_percentiles_item_array = 1;
 }
+message ArrayPercentilesItemValue {
+  oneof array_percentiles_item_value {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
 message AutoDateHistogramAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
@@ -573,7 +589,7 @@ message AvgAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
@@ -672,7 +688,7 @@ message BucketMetricValueAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 
@@ -951,37 +967,6 @@ message Completion {
 
   repeated CompletionAllOfOptionsInner options = 4;
 }
-message Completion1 {
-  int32 length = 1;
-
-  int32 offset = 2;
-
-  string text = 3;
-
-  repeated Completion1AllOfOptionsInner options = 4;
-}
-message Completion1AllOfOptionsInner {
-  optional bool collate_match = 1;
-
-  map<string, ContextArray> contexts = 2;
-
-  optional ObjectMap fields = 3;
-
-  string text = 4;
-
-  optional float score = 5;
-
-  optional string underscore_id = 6;
-
-  optional string underscore_index = 7;
-
-  // The routing value for the document.
-  optional string underscore_routing = 8;
-
-  optional float underscore_score = 9;
-
-  optional ObjectMap underscore_source = 10;
-}
 message CompletionAllOfOptionsInner {
   optional bool collate_match = 1;
 
@@ -1412,9 +1397,9 @@ message DateRangeQueryParameters {
 
   optional string lte = 4;
 
-  optional string from = 5;
+  optional DateRangeQueryParametersFrom from = 5;
 
-  optional string to = 6;
+  optional DateRangeQueryParametersTo to = 6;
 
   // The date format pattern.
   optional string format = 7;
@@ -1422,6 +1407,20 @@ message DateRangeQueryParameters {
   // The time zone identifier.
   optional string time_zone = 8;
 }
+message DateRangeQueryParametersFrom {
+  oneof date_range_query_parameters_from {
+    string string = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message DateRangeQueryParametersTo {
+  oneof date_range_query_parameters_to {
+    string string = 1;
+
+    NullValue null_value = 2;
+  }
+}
 message DateTime {
   oneof date_time {
     string string = 1;
@@ -1472,7 +1471,7 @@ message DerivativeAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 
@@ -1731,11 +1730,11 @@ message ExtendedStatsAggregate {
 
   int64 count = 2;
 
-  double min = 3;
+  StatsAggregateBaseAllOfMin min = 3;
 
-  double max = 4;
+  StatsAggregateBaseAllOfMax max = 4;
 
-  double avg = 5;
+  StatsAggregateBaseAllOfAvg avg = 5;
 
   double sum = 6;
 
@@ -1747,19 +1746,19 @@ message ExtendedStatsAggregate {
 
   optional string sum_as_string = 10;
 
-  double sum_of_squares = 11;
+  ExtendedStatsAggregateBaseAllOfSumOfSquares sum_of_squares = 11;
 
-  double variance = 12;
+  ExtendedStatsAggregateBaseAllOfVariance variance = 12;
 
-  double variance_population = 13;
+  ExtendedStatsAggregateBaseAllOfVariancePopulation variance_population = 13;
 
-  double variance_sampling = 14;
+  ExtendedStatsAggregateBaseAllOfVarianceSampling variance_sampling = 14;
 
-  double std_deviation = 15;
+  ExtendedStatsAggregateBaseAllOfStdDeviation std_deviation = 15;
 
-  double std_deviation_population = 16;
+  ExtendedStatsAggregateBaseAllOfStdDeviationPopulation std_deviation_population = 16;
 
-  double std_deviation_sampling = 17;
+  ExtendedStatsAggregateBaseAllOfStdDeviationSampling std_deviation_sampling = 17;
 
   optional StandardDeviationBounds std_deviation_bounds = 18;
 
@@ -1781,11 +1780,11 @@ message ExtendedStatsAggregateBase {
 
   int64 count = 2;
 
-  double min = 3;
+  StatsAggregateBaseAllOfMin min = 3;
 
-  double max = 4;
+  StatsAggregateBaseAllOfMax max = 4;
 
-  double avg = 5;
+  StatsAggregateBaseAllOfAvg avg = 5;
 
   double sum = 6;
 
@@ -1797,19 +1796,19 @@ message ExtendedStatsAggregateBase {
 
   optional string sum_as_string = 10;
 
-  optional double sum_of_squares = 11;
+  ExtendedStatsAggregateBaseAllOfSumOfSquares sum_of_squares = 11;
 
-  optional double variance = 12;
+  ExtendedStatsAggregateBaseAllOfVariance variance = 12;
 
-  optional double variance_population = 13;
+  ExtendedStatsAggregateBaseAllOfVariancePopulation variance_population = 13;
 
-  optional double variance_sampling = 14;
+  ExtendedStatsAggregateBaseAllOfVarianceSampling variance_sampling = 14;
 
-  optional double std_deviation = 15;
+  ExtendedStatsAggregateBaseAllOfStdDeviation std_deviation = 15;
 
-  optional double std_deviation_population = 16;
+  ExtendedStatsAggregateBaseAllOfStdDeviationPopulation std_deviation_population = 16;
 
-  optional double std_deviation_sampling = 17;
+  ExtendedStatsAggregateBaseAllOfStdDeviationSampling std_deviation_sampling = 17;
 
   optional StandardDeviationBounds std_deviation_bounds = 18;
 
@@ -1825,6 +1824,55 @@ message ExtendedStatsAggregateBase {
 
   optional StandardDeviationBoundsAsString std_deviation_bounds_as_string = 24;
 }
+message ExtendedStatsAggregateBaseAllOfStdDeviation {
+  oneof extended_stats_aggregate_base_all_of_std_deviation {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message ExtendedStatsAggregateBaseAllOfStdDeviationPopulation {
+  oneof extended_stats_aggregate_base_all_of_std_deviation_population {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message ExtendedStatsAggregateBaseAllOfStdDeviationSampling {
+  oneof extended_stats_aggregate_base_all_of_std_deviation_sampling {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message ExtendedStatsAggregateBaseAllOfSumOfSquares {
+  oneof extended_stats_aggregate_base_all_of_sum_of_squares {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message ExtendedStatsAggregateBaseAllOfVariance {
+  oneof extended_stats_aggregate_base_all_of_variance {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message ExtendedStatsAggregateBaseAllOfVariancePopulation {
+  oneof extended_stats_aggregate_base_all_of_variance_population {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message ExtendedStatsAggregateBaseAllOfVarianceSampling {
+  oneof extended_stats_aggregate_base_all_of_variance_sampling {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
 message ExtendedStatsAggregation {
   // The path to a field or an array of paths. Some APIs support wildcards in the path, which allows you to select multiple fields.
   optional string field = 1;
@@ -1844,11 +1892,11 @@ message ExtendedStatsBucketAggregate {
 
   int64 count = 2;
 
-  double min = 3;
+  StatsAggregateBaseAllOfMin min = 3;
 
-  double max = 4;
+  StatsAggregateBaseAllOfMax max = 4;
 
-  double avg = 5;
+  StatsAggregateBaseAllOfAvg avg = 5;
 
   double sum = 6;
 
@@ -1860,19 +1908,19 @@ message ExtendedStatsBucketAggregate {
 
   optional string sum_as_string = 10;
 
-  double sum_of_squares = 11;
+  ExtendedStatsAggregateBaseAllOfSumOfSquares sum_of_squares = 11;
 
-  double variance = 12;
+  ExtendedStatsAggregateBaseAllOfVariance variance = 12;
 
-  double variance_population = 13;
+  ExtendedStatsAggregateBaseAllOfVariancePopulation variance_population = 13;
 
-  double variance_sampling = 14;
+  ExtendedStatsAggregateBaseAllOfVarianceSampling variance_sampling = 14;
 
-  double std_deviation = 15;
+  ExtendedStatsAggregateBaseAllOfStdDeviation std_deviation = 15;
 
-  double std_deviation_population = 16;
+  ExtendedStatsAggregateBaseAllOfStdDeviationPopulation std_deviation_population = 16;
 
-  double std_deviation_sampling = 17;
+  ExtendedStatsAggregateBaseAllOfStdDeviationSampling std_deviation_sampling = 17;
 
   optional StandardDeviationBounds std_deviation_bounds = 18;
 
@@ -2920,7 +2968,7 @@ message Hit {
   // The unique identifier for a resource.
   optional string underscore_id = 9;
 
-  optional double underscore_score = 10;
+  optional HitUnderscoreScore underscore_score = 10;
 
   optional Explanation underscore_explanation = 11;
 
@@ -2943,12 +2991,19 @@ message Hit {
 
   optional int64 underscore_version = 20;
 }
+message HitUnderscoreScore {
+  oneof hit_underscore_score {
+    NullValue null_value = 1;
+
+    double double = 2;
+  }
+}
 message HitsMetadata {
   optional HitsMetadataTotal total = 1;
 
   repeated HitsMetadataHitsInner hits = 2;
 
-  optional float max_score = 3;
+  optional HitsMetadataMaxScore max_score = 3;
 }
 message HitsMetadataHitsInner {
   optional ObjectMap fields = 1;
@@ -2971,7 +3026,7 @@ message HitsMetadataHitsInner {
   // The unique identifier for a resource.
   optional string underscore_id = 9;
 
-  optional double underscore_score = 10;
+  optional HitUnderscoreScore underscore_score = 10;
 
   optional Explanation underscore_explanation = 11;
 
@@ -2999,11 +3054,18 @@ message HitsMetadataJsonValue {
 
   repeated HitsMetadataJsonValueAllOfHits hits = 2;
 
-  optional float max_score = 3;
+  optional HitsMetadataMaxScore max_score = 3;
 }
 message HitsMetadataJsonValueAllOfHits {
   optional ObjectMap source = 1 [json_name = "_source"];
 }
+message HitsMetadataMaxScore {
+  oneof hits_metadata_max_score {
+    NullValue null_value = 1;
+
+    float float = 2;
+  }
+}
 message HitsMetadataTotal {
   oneof hits_metadata_total {
     TotalHits total_hits = 1;
@@ -3399,6 +3461,8 @@ message KeyedPercentilesValue {
     double double = 1;
 
     string string = 2;
+
+    NullValue null_value = 3;
   }
 }
 message KeyedPercentilesValueMap {
@@ -3813,7 +3877,7 @@ message MaxAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
@@ -3844,7 +3908,7 @@ message MedianAbsoluteDeviationAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
@@ -3873,7 +3937,7 @@ message MinAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
@@ -4545,6 +4609,8 @@ message NumberRangeQueryParametersFrom {
     double double = 1;
 
     string string = 2;
+
+    NullValue null_value = 3;
   }
 }
 message NumberRangeQueryParametersTo {
@@ -4552,6 +4618,8 @@ message NumberRangeQueryParametersTo {
     double double = 1;
 
     string string = 2;
+
+    NullValue null_value = 3;
   }
 }
 message NumericDecayPlacement {
@@ -5308,9 +5376,9 @@ message RangeQueryOneOf1 {
 
   optional string lte = 7;
 
-  optional string from = 8;
+  optional DateRangeQueryParametersFrom from = 8;
 
-  optional string to = 9;
+  optional DateRangeQueryParametersTo to = 9;
 
   // The date format pattern.
   optional string format = 10;
@@ -5739,7 +5807,7 @@ message SearchResponse {
 
   optional PhaseTook phase_took = 3;
 
-  SearchResultHits hits = 4;
+  HitsMetadata hits = 4;
 
   repeated ProcessorExecutionDetail processor_results = 5;
 
@@ -5754,7 +5822,7 @@ message SearchResponse {
   // The unique identifier for a resource.
   optional string pit_id = 10;
 
-  map<string, SearchResultSuggestValueInnerArray> suggest = 11;
+  map<string, SuggestArray> suggest = 11;
 
   optional bool terminated_early = 12;
 
@@ -5771,7 +5839,7 @@ message SearchResult {
 
   optional PhaseTook phase_took = 3;
 
-  SearchResultHits hits = 4;
+  HitsMetadata hits = 4;
 
   repeated ProcessorExecutionDetail processor_results = 5;
 
@@ -5786,7 +5854,7 @@ message SearchResult {
   // The unique identifier for a resource.
   optional string pit_id = 10;
 
-  map<string, SearchResultSuggestValueInnerArray> suggest = 11;
+  map<string, SuggestArray> suggest = 11;
 
   optional bool terminated_early = 12;
 
@@ -5796,69 +5864,6 @@ message SearchResult {
 
   optional string underscore_scroll_id = 15;
 }
-message SearchResultHits {
-  optional HitsMetadataTotal total = 1;
-
-  repeated SearchResultHitsAllOfHitsInner hits = 2;
-
-  optional float max_score = 3;
-}
-message SearchResultHitsAllOfHitsInner {
-  optional ObjectMap fields = 1;
-
-  map<string, StringArray> highlight = 2;
-
-  map<string, InnerHitsResult> inner_hits = 3;
-
-  repeated string matched_queries = 4;
-
-  map<string, StringArray> ignored_field_values = 5;
-
-  repeated FieldValue sort = 6;
-
-  // The type of document or resource.
-  optional string underscore_type = 7;
-
-  optional string underscore_index = 8;
-
-  // The unique identifier for a resource.
-  optional string underscore_id = 9;
-
-  optional double underscore_score = 10;
-
-  optional Explanation underscore_explanation = 11;
-
-  optional NestedIdentity underscore_nested = 12;
-
-  repeated string underscore_ignored = 13;
-
-  optional string underscore_shard = 14;
-
-  optional string underscore_node = 15;
-
-  optional string underscore_routing = 16;
-
-  optional ObjectMap underscore_source = 17;
-
-  // The sequence number of the document.
-  optional int64 underscore_seq_no = 18;
-
-  optional int64 underscore_primary_term = 19;
-
-  optional int64 underscore_version = 20;
-}
-message SearchResultSuggestValueInner {
-  int32 length = 1;
-
-  int32 offset = 2;
-
-  string text = 3;
-
-  repeated TermSuggestOption options = 4;
-}
-message SearchResultSuggestValueInnerArray {
-  repeated SearchResultSuggestValueInner search_result_suggest_value_inner_array = 1;
-}
 enum SearchType {
   SEARCH_TYPE_UNSPECIFIED = 0;
   SEARCH_TYPE_DFS_QUERY_THEN_FETCH = 1;
@@ -6229,7 +6234,7 @@ message SimpleValueAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
@@ -6245,10 +6250,17 @@ message SingleMetricAggregateBase {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  optional double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
+message SingleMetricAggregateBaseAllOfValue {
+  oneof single_metric_aggregate_base_all_of_value {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
 message SlicedScroll {
   // The path to a field or an array of paths. Some APIs support wildcards in the path, which allows you to select multiple fields.
   optional string field = 1;
@@ -6495,17 +6507,17 @@ enum StandardAnalyzerType {
   STANDARD_ANALYZER_TYPE_STANDARD = 1;
 }
 message StandardDeviationBounds {
-  optional double upper = 1;
+  StandardDeviationBoundsUpper upper = 1;
 
-  optional double lower = 2;
+  StandardDeviationBoundsLower lower = 2;
 
-  optional double upper_population = 3;
+  StandardDeviationBoundsUpperPopulation upper_population = 3;
 
-  optional double lower_population = 4;
+  StandardDeviationBoundsLowerPopulation lower_population = 4;
 
-  optional double upper_sampling = 5;
+  StandardDeviationBoundsUpperSampling upper_sampling = 5;
 
-  optional double lower_sampling = 6;
+  StandardDeviationBoundsLowerSampling lower_sampling = 6;
 }
 message StandardDeviationBoundsAsString {
   string upper = 1;
@@ -6520,17 +6532,59 @@ message StandardDeviationBoundsAsString {
 
   string lower_sampling = 6;
 }
+message StandardDeviationBoundsLower {
+  oneof standard_deviation_bounds_lower {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message StandardDeviationBoundsLowerPopulation {
+  oneof standard_deviation_bounds_lower_population {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message StandardDeviationBoundsLowerSampling {
+  oneof standard_deviation_bounds_lower_sampling {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message StandardDeviationBoundsUpper {
+  oneof standard_deviation_bounds_upper {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message StandardDeviationBoundsUpperPopulation {
+  oneof standard_deviation_bounds_upper_population {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message StandardDeviationBoundsUpperSampling {
+  oneof standard_deviation_bounds_upper_sampling {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
 message StatsAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
   int64 count = 2;
 
-  double min = 3;
+  StatsAggregateBaseAllOfMin min = 3;
 
-  double max = 4;
+  StatsAggregateBaseAllOfMax max = 4;
 
-  double avg = 5;
+  StatsAggregateBaseAllOfAvg avg = 5;
 
   double sum = 6;
 
@@ -6548,11 +6602,11 @@ message StatsAggregateBase {
 
   int64 count = 2;
 
-  optional double min = 3;
+  StatsAggregateBaseAllOfMin min = 3;
 
-  optional double max = 4;
+  StatsAggregateBaseAllOfMax max = 4;
 
-  optional double avg = 5;
+  StatsAggregateBaseAllOfAvg avg = 5;
 
   double sum = 6;
 
@@ -6564,6 +6618,27 @@ message StatsAggregateBase {
 
   optional string sum_as_string = 10;
 }
+message StatsAggregateBaseAllOfAvg {
+  oneof stats_aggregate_base_all_of_avg {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message StatsAggregateBaseAllOfMax {
+  oneof stats_aggregate_base_all_of_max {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
+message StatsAggregateBaseAllOfMin {
+  oneof stats_aggregate_base_all_of_min {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
 message StatsAggregation {
   // The path to a field or an array of paths. Some APIs support wildcards in the path, which allows you to select multiple fields.
   optional string field = 1;
@@ -6580,11 +6655,11 @@ message StatsBucketAggregate {
 
   int64 count = 2;
 
-  double min = 3;
+  StatsAggregateBaseAllOfMin min = 3;
 
-  double max = 4;
+  StatsAggregateBaseAllOfMax max = 4;
 
-  double avg = 5;
+  StatsAggregateBaseAllOfAvg avg = 5;
 
   double sum = 6;
 
@@ -6683,13 +6758,16 @@ message StupidBackoffSmoothingModel {
 }
 message Suggest {
   oneof suggest {
-    Completion1 completion1 = 1;
+    Completion completion = 1;
 
     PhraseSuggest phrase = 2;
 
     TermSuggest term = 3;
   }
 }
+message SuggestArray {
+  repeated Suggest suggest_array = 1;
+}
 message SuggestBase {
   int32 length = 1;
 
@@ -6734,7 +6812,7 @@ message SumAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
@@ -6781,10 +6859,17 @@ message TTestAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  optional double value = 2;
+  TTestAggregateAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
+message TTestAggregateAllOfValue {
+  oneof t_test_aggregate_all_of_value {
+    double double = 1;
+
+    NullValue null_value = 2;
+  }
+}
 message TTestAggregation {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
@@ -7261,7 +7346,7 @@ message ValueCountAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
@@ -7376,7 +7461,7 @@ message WeightedAvgAggregate {
   // The custom metadata attached to a resource.
   optional ObjectMap meta = 1;
 
-  double value = 2;
+  SingleMetricAggregateBaseAllOfValue value = 2;
 
   optional string value_as_string = 3;
 }
diff --git a/protos/generated/services/default_service.proto b/protos/generated/services/default_service.proto
index 62510efb772..fe64c209438 100644
--- a/protos/generated/services/default_service.proto
+++ b/protos/generated/services/default_service.proto
@@ -44,20 +44,14 @@ message BulkRequest {
   // The number of shard copies that must be active before proceeding with the operation. Set to all or any positive integer up to the total number of shards in the index (`number_of_replicas+1`).
   optional WaitForActiveShards wait_for_active_shards = 12;
 
-  // Whether to pretty-format the returned JSON response.
-  optional bool pretty = 13;
-
   // Whether to return human-readable values for statistics.
-  optional bool human = 14;
+  optional bool human = 13;
 
   // Whether to include the stack trace of returned errors.
-  optional bool error_trace = 15;
-
-  // The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.
-  optional string source = 16;
+  optional bool error_trace = 14;
 
   // A comma-separated list of filters used to filter the response. Use wildcards to match any field or part of a field's name. To exclude fields, use `-`.
-  repeated string filter_path = 17;
+  repeated string filter_path = 15;
 }
 
 message BulkResponse {
@@ -210,28 +204,20 @@ message SearchRequest {
   // If `true`, returns document version as part of a hit.
   optional bool version = 48;
 
-  // Whether to pretty-format the returned JSON response.
-  optional bool pretty = 49;
-
   // Whether to return human-readable values for statistics.
-  optional bool human = 50;
+  optional bool human = 49;
 
   // Whether to include the stack trace of returned errors.
-  optional bool error_trace = 51;
-
-  // The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.
-  optional string source = 52;
+  optional bool error_trace = 50;
 
   // A comma-separated list of filters used to filter the response. Use wildcards to match any field or part of a field's name. To exclude fields, use `-`.
-  repeated string filter_path = 53;
+  repeated string filter_path = 51;
 
-  optional SearchRequest search_request = 54;
+  optional SearchRequest search_request = 52;
 }
 
 message SearchResponse {
   oneof response {
     SearchResponse search_response_200 = 1;
-    ErrorResponseBase error_response_base_400 = 2;
-    ErrorResponseBase error_response_base_404 = 3;
   }
 }