diff --git a/.github/workflows/convert-proto.yml b/.github/workflows/convert-proto.yml
index ce8a5ceb242..0dcf58bb445 100644
--- a/.github/workflows/convert-proto.yml
+++ b/.github/workflows/convert-proto.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   auto-proto-convert:
     runs-on: ubuntu-latest
-    if: github.repository == 'opensearch-project/opensearch-protobufs'
+    # if: github.repository == 'opensearch-project/opensearch-protobufs'
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
diff --git a/protos/generated/models/aggregated_models.proto b/protos/generated/models/aggregated_models.proto
index 92833725d43..f8932a37a93 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;
 
@@ -1412,9 +1428,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 +1438,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 +1502,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 +1761,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 +1777,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 +1811,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 +1827,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 +1855,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 +1923,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 +1939,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 +2999,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 +3022,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 +3057,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 +3085,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 +3492,8 @@ message KeyedPercentilesValue {
     double double = 1;
 
     string string = 2;
+
+    NullValue null_value = 3;
   }
 }
 message KeyedPercentilesValueMap {
@@ -3813,7 +3908,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 +3939,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 +3968,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 +4640,8 @@ message NumberRangeQueryParametersFrom {
     double double = 1;
 
     string string = 2;
+
+    NullValue null_value = 3;
   }
 }
 message NumberRangeQueryParametersTo {
@@ -4552,6 +4649,8 @@ message NumberRangeQueryParametersTo {
     double double = 1;
 
     string string = 2;
+
+    NullValue null_value = 3;
   }
 }
 message NumericDecayPlacement {
@@ -5308,9 +5407,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;
@@ -5801,7 +5900,7 @@ message SearchResultHits {
 
   repeated SearchResultHitsAllOfHitsInner hits = 2;
 
-  optional float max_score = 3;
+  optional HitsMetadataMaxScore max_score = 3;
 }
 message SearchResultHitsAllOfHitsInner {
   optional ObjectMap fields = 1;
@@ -5824,7 +5923,7 @@ message SearchResultHitsAllOfHitsInner {
   // 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;
 
@@ -6229,7 +6328,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 +6344,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 +6601,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 +6626,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 +6696,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 +6712,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 +6749,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;
 
@@ -6734,7 +6903,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 +6950,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 +7437,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 +7552,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;
 }