diff --git a/.github/ISSUE_TEMPLATE/bug_template.yml b/.github/ISSUE_TEMPLATE/bug_template.yml
index 2cd1ee8a7e688..5f0798abe0f68 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.yml
+++ b/.github/ISSUE_TEMPLATE/bug_template.yml
@@ -15,7 +15,7 @@ body:
       description: Choose a specific OpenSearch component your bug belongs to.  If you are unsure which to select or if the component is not present, select "Other".
       multiple: false
       options:
-        - Other
+        - # Empty first option to force selection
         - Build
         - Clients
         - Cluster Manager
@@ -24,6 +24,7 @@ body:
         - Indexing:Replication
         - Indexing
         - Libraries
+        - Other
         - Plugins
         - Search:Aggregations
         - Search:Performance
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index d93ac8b590706..0159e771f7f80 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -22,7 +22,7 @@ body:
       description: Choose a specific OpenSearch component your feature request belongs to.  If you are unsure of which component to select or if the component is not present, select "Other".
       multiple: false
       options:
-        - Other
+        - # Empty first option to force selection
         - Build
         - Clients
         - Cluster Manager
@@ -31,6 +31,7 @@ body:
         - Indexing:Replication
         - Indexing
         - Libraries
+        - Other
         - Plugins
         - Search:Aggregations
         - Search:Performance
diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml
index ca026f530b4af..2714d45bd108f 100644
--- a/.github/workflows/links.yml
+++ b/.github/workflows/links.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: lychee Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1.8.0
+        uses: lycheeverse/lychee-action@v1.9.0
         with:
           args: --accept=200,403,429 --exclude-mail **/*.html **/*.md **/*.txt **/*.json --exclude-file .lychee.excludes
           fail: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5191c5e04a41..45ab53b0d4246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,6 +107,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Implement on behalf of token passing for extensions ([#8679](https://github.com/opensearch-project/OpenSearch/pull/8679))
 - Provide service accounts tokens to extensions ([#9618](https://github.com/opensearch-project/OpenSearch/pull/9618))
 - [Streaming Indexing] Introduce new experimental server HTTP transport based on Netty 4 and Project Reactor (Reactor Netty) ([#9672](https://github.com/opensearch-project/OpenSearch/pull/9672))
+- Enable must_exist parameter for update aliases API ([#11210](https://github.com/opensearch-project/OpenSearch/pull/11210))
 - Add back half_float BKD based sort query optimization ([#11024](https://github.com/opensearch-project/OpenSearch/pull/11024))
 - Request level coordinator slow logs ([#10650](https://github.com/opensearch-project/OpenSearch/pull/10650))
 - Add template snippets support for field and target_field in KV ingest processor ([#10040](https://github.com/opensearch-project/OpenSearch/pull/10040))
@@ -120,11 +121,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add additional handling in SearchTemplateRequest when simulate is set to true ([#11591](https://github.com/opensearch-project/OpenSearch/pull/11591))
 - Introduce cluster level setting `cluster.index.restrict.replication.type` to prevent replication type setting override during index creations([#11583](https://github.com/opensearch-project/OpenSearch/pull/11583))
 - Add match_only_text field that is optimized for storage by trading off positional queries performance ([#6836](https://github.com/opensearch-project/OpenSearch/pull/11039))
+- Introduce new feature flag "WRITEABLE_REMOTE_INDEX" to gate the writeable remote index functionality ([#11717](https://github.com/opensearch-project/OpenSearch/pull/11170))
 
 ### Dependencies
 - Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822))
 - Bump Lucene from 9.7.0 to 9.8.0 ([10276](https://github.com/opensearch-project/OpenSearch/pull/10276))
-- Bump `commons-io:commons-io` from 2.13.0 to 2.15.1 ([#10294](https://github.com/opensearch-project/OpenSearch/pull/10294), [#11001](https://github.com/opensearch-project/OpenSearch/pull/11001), [#11002](https://github.com/opensearch-project/OpenSearch/pull/11002), [#11446](https://github.com/opensearch-project/OpenSearch/pull/11446), [#11554](https://github.com/opensearch-project/OpenSearch/pull/11554), [#11560](https://github.com/opensearch-project/OpenSearch/pull/11560))
+- Bump `commons-io:commons-io` from 2.13.0 to 2.15.1 ([#10294](https://github.com/opensearch-project/OpenSearch/pull/10294), [#11001](https://github.com/opensearch-project/OpenSearch/pull/11001), [#11002](https://github.com/opensearch-project/OpenSearch/pull/11002), [#11446](https://github.com/opensearch-project/OpenSearch/pull/11446), [#11554](https://github.com/opensearch-project/OpenSearch/pull/11554), [#11560](https://github.com/opensearch-project/OpenSearch/pull/11560), [#11796](https://github.com/opensearch-project/OpenSearch/pull/11796))
 - Bump `com.google.api.grpc:proto-google-common-protos` from 2.10.0 to 2.25.1 ([#10208](https://github.com/opensearch-project/OpenSearch/pull/10208), [#10298](https://github.com/opensearch-project/OpenSearch/pull/10298))
 - Bump `com.netflix.nebula.ospackage-base` from 11.4.0 to 11.6.0 ([#10295](https://github.com/opensearch-project/OpenSearch/pull/10295), [#11630](https://github.com/opensearch-project/OpenSearch/pull/11630))
 - Bump `org.apache.zookeeper:zookeeper` from 3.9.0 to 3.9.1 ([#10506](https://github.com/opensearch-project/OpenSearch/pull/10506))
@@ -138,7 +140,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `stefanzweifel/git-auto-commit-action` from 4 to 5 ([#11171](https://github.com/opensearch-project/OpenSearch/pull/11171))
 - Bump `actions/github-script` from 6 to 7 ([#11271](https://github.com/opensearch-project/OpenSearch/pull/11271))
 - Bump `jackson` and `jackson_databind` from 2.15.2 to 2.16.0 ([#11273](https://github.com/opensearch-project/OpenSearch/pull/11273))
-- Bump `netty` from 4.1.100.Final to 4.1.101.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294))
+- Bump `netty` from 4.1.100.Final to 4.1.104.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294), [#11775](https://github.com/opensearch-project/OpenSearch/pull/11775))
 - Bump `com.avast.gradle:gradle-docker-compose-plugin` from 0.16.12 to 0.17.6 ([#10163](https://github.com/opensearch-project/OpenSearch/pull/10163), [#11692](https://github.com/opensearch-project/OpenSearch/pull/11692))
 - Bump `com.squareup.okhttp3:okhttp` from 4.11.0 to 4.12.0 ([#10861](https://github.com/opensearch-project/OpenSearch/pull/10861))
 - Bump `org.apache.commons:commons-text` from 1.10.0 to 1.11.0 ([#11344](https://github.com/opensearch-project/OpenSearch/pull/11344))
@@ -158,11 +160,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.maxmind.geoip2:geoip2` from 4.1.0 to 4.2.0 ([#11559](https://github.com/opensearch-project/OpenSearch/pull/11559))
 - Bump `org.apache.commons:commons-lang3` from 3.13.0 to 3.14.0 ([#11691](https://github.com/opensearch-project/OpenSearch/pull/11691))
 - Bump `com.maxmind.db:maxmind-db` from 3.0.0 to 3.1.0 ([#11693](https://github.com/opensearch-project/OpenSearch/pull/11693))
+- Bump `net.java.dev.jna:jna` from 5.13.0 to 5.14.0 ([#11798](https://github.com/opensearch-project/OpenSearch/pull/11798))
+- Bump `lycheeverse/lychee-action` from 1.8.0 to 1.9.0 ([#11795](https://github.com/opensearch-project/OpenSearch/pull/11795))
 
 ### Changed
 - Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))
 - Force merge with `only_expunge_deletes` honors max segment size ([#10036](https://github.com/opensearch-project/OpenSearch/pull/10036))
-- Add the means to extract the contextual properties from HttpChannel, TcpCChannel and TrasportChannel without excessive typecasting ([#10562](https://github.com/opensearch-project/OpenSearch/pull/10562))
+- Add the means to extract the contextual properties from HttpChannel, TcpCChannel and TrasportChannel without excessive typecasting ([#10562](https://github.com/opensearch-project/OpenSearch/pull/10562)), ([#11751](https://github.com/opensearch-project/OpenSearch/pull/11751))
 - Introduce new dynamic cluster setting to control slice computation for concurrent segment search ([#9107](https://github.com/opensearch-project/OpenSearch/pull/9107))
 - Search pipelines now support asynchronous request and response processors to avoid blocking on a transport thread ([#10598](https://github.com/opensearch-project/OpenSearch/pull/10598))
 - [Remote Store] Add Remote Store backpressure rejection stats to `_nodes/stats` ([#10524](https://github.com/opensearch-project/OpenSearch/pull/10524))
@@ -170,17 +174,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add telemetry tracer/metric enable flag and integ test. ([#10395](https://github.com/opensearch-project/OpenSearch/pull/10395))
 - Performance improvement for Datetime field caching ([#4558](https://github.com/opensearch-project/OpenSearch/issues/4558))
 - Add instrumentation for indexing in transport bulk action and transport shard bulk action. ([#10273](https://github.com/opensearch-project/OpenSearch/pull/10273))
-- Disallow removing some metadata fields by remove ingest processor ([#10895](https://github.com/opensearch-project/OpenSearch/pull/10895))
+- Disallow removing some metadata fields by remove ingest processor ([#10895](https://github.com/opensearch-project/OpenSearch/pull/10895), [#11607](https://github.com/opensearch-project/OpenSearch/pull/11607))
 - Performance improvement for MultiTerm Queries on Keyword fields ([#7057](https://github.com/opensearch-project/OpenSearch/issues/7057))
 - Refactor common parts from the Rounding class into a separate 'round' package ([#11023](https://github.com/opensearch-project/OpenSearch/issues/11023))
 - Performance improvement for date histogram aggregations without sub-aggregations ([#11083](https://github.com/opensearch-project/OpenSearch/pull/11083))
 - Disable concurrent aggs for Diversified Sampler and Sampler aggs ([#11087](https://github.com/opensearch-project/OpenSearch/issues/11087))
 - Made leader/follower check timeout setting dynamic ([#10528](https://github.com/opensearch-project/OpenSearch/pull/10528))
+- Improved performance of numeric exact-match queries ([#11209](https://github.com/opensearch-project/OpenSearch/pull/11209))
 - Change error message when per shard document limit is breached ([#11312](https://github.com/opensearch-project/OpenSearch/pull/11312))
 - Improve boolean parsing performance ([#11308](https://github.com/opensearch-project/OpenSearch/pull/11308))
 - Interpret byte array as primitive using VarHandles ([#11362](https://github.com/opensearch-project/OpenSearch/pull/11362))
 - Automatically add scheme to discovery.ec2.endpoint ([#11512](https://github.com/opensearch-project/OpenSearch/pull/11512))
 - Restore support for Java 8 for RestClient ([#11562](https://github.com/opensearch-project/OpenSearch/pull/11562))
+- Add deleted doc count in _cat/shards ([#11678](https://github.com/opensearch-project/OpenSearch/pull/11678))
+- Capture information for additional query types and aggregation types ([#11582](https://github.com/opensearch-project/OpenSearch/pull/11582))
 
 ### Deprecated
 
@@ -189,7 +196,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Fixed
 - Fix failure in dissect ingest processor parsing empty brackets ([#9225](https://github.com/opensearch-project/OpenSearch/pull/9255))
-- Fix class_cast_exception when passing int to _version and other metadata fields in ingest simulate API ([#10101](https://github.com/opensearch-project/OpenSearch/pull/10101))
+- Fix `class_cast_exception` when passing int to `_version` and other metadata fields in ingest simulate API ([#10101](https://github.com/opensearch-project/OpenSearch/pull/10101))
 - Fix Segment Replication ShardLockObtainFailedException bug during index corruption ([10370](https://github.com/opensearch-project/OpenSearch/pull/10370))
 - Fix some test methods in SimulatePipelineRequestParsingTests never run and fix test failure ([#10496](https://github.com/opensearch-project/OpenSearch/pull/10496))
 - Fix passing wrong parameter when calling newConfigurationException() in DotExpanderProcessor ([#10737](https://github.com/opensearch-project/OpenSearch/pull/10737))
@@ -201,6 +208,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix the issue with DefaultSpanScope restoring wrong span in the TracerContextStorage upon detach ([#11316](https://github.com/opensearch-project/OpenSearch/issues/11316))
 - Remove shadowJar from `lang-painless` module publication ([#11369](https://github.com/opensearch-project/OpenSearch/issues/11369))
 - Fix remote shards balancer and remove unused variables ([#11167](https://github.com/opensearch-project/OpenSearch/pull/11167))
+- Fix parsing of flat object fields with dots in keys ([#11425](https://github.com/opensearch-project/OpenSearch/pull/11425))
 - Fix bug where replication lag grows post primary relocation ([#11238](https://github.com/opensearch-project/OpenSearch/pull/11238))
 - Fix for stuck update action in a bulk with `retry_on_conflict` property ([#11152](https://github.com/opensearch-project/OpenSearch/issues/11152))
 - Fix template setting override for replication type ([#11417](https://github.com/opensearch-project/OpenSearch/pull/11417))
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index a42976fef572c..3c846b48549fb 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -110,7 +110,7 @@ dependencies {
   api 'com.netflix.nebula:gradle-info-plugin:12.1.6'
   api 'org.apache.rat:apache-rat:0.15'
   api 'commons-io:commons-io:2.15.1'
-  api "net.java.dev.jna:jna:5.13.0"
+  api "net.java.dev.jna:jna:5.14.0"
   api 'com.github.johnrengelman:shadow:8.1.1'
   api 'org.jdom:jdom2:2.0.6.1'
   api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${props.getProperty('kotlin')}"
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 74d655cfb1045..58b54e7b77a1e 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -26,7 +26,7 @@ jakarta_annotation = 1.3.5
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.13.0
 
-netty             = 4.1.101.Final
+netty             = 4.1.104.Final
 joda              = 2.12.2
 
 # project reactor
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/11_match_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/11_match_field_match_only_text.yml
index 40ff2c2f4cdbe..140d70414a4a7 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/11_match_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/11_match_field_match_only_text.yml
@@ -2,8 +2,8 @@
 
 "match query with stacked stems":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   # Tests the match query stemmed tokens are "stacked" on top of the unstemmed
   # versions in the same position.
   - do:
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/20_ngram_search_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/20_ngram_search_field_match_only_text.yml
index 95b648dee47c8..a5da3043f19b5 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/20_ngram_search_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/20_ngram_search_field_match_only_text.yml
@@ -1,7 +1,7 @@
 "ngram search":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
         index: test
@@ -45,8 +45,8 @@
 ---
 "testNGramCopyField":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
         index: test
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/30_ngram_highligthing_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/30_ngram_highligthing_field_match_only_text.yml
index 597f55679a2c6..accf5d975d57f 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/30_ngram_highligthing_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/30_ngram_highligthing_field_match_only_text.yml
@@ -1,7 +1,7 @@
 "ngram highlighting":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
         index: test
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/40_query_string_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/40_query_string_field_match_only_text.yml
index ddebb1d76acbc..717d3a7dd8a3e 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/40_query_string_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/40_query_string_field_match_only_text.yml
@@ -1,8 +1,8 @@
 ---
 "Test query string with snowball":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
           index:  test
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/41_query_string_with_default_analyzer_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/41_query_string_with_default_analyzer_field_match_only_text.yml
index 97f3fb65e94a2..cd2d2e42c6a17 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/41_query_string_with_default_analyzer_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/41_query_string_with_default_analyzer_field_match_only_text.yml
@@ -1,8 +1,8 @@
 ---
 "Test default search analyzer is applied":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
         index: test
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/50_queries_with_synonyms_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/50_queries_with_synonyms_field_match_only_text.yml
index 0c263a47a38e6..0c537dd42d583 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/50_queries_with_synonyms_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/50_queries_with_synonyms_field_match_only_text.yml
@@ -1,8 +1,8 @@
 ---
 "Test common terms query with stacked tokens":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
       features: "allowed_warnings"
 
   - do:
@@ -247,8 +247,8 @@
 ---
 "Test match query with synonyms - see #3881 for extensive description of the issue":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
           index: test
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/60_synonym_graph_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/60_synonym_graph_field_match_only_text.yml
index 91a8b1509517e..d3f5d0fe4f8b4 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/60_synonym_graph_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/60_synonym_graph_field_match_only_text.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
         index: test
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals_field_match_only_text.yml
index 9792c9d2695ea..8334ca27ff274 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals_field_match_only_text.yml
@@ -1,8 +1,8 @@
 # integration tests for intervals queries using analyzers
 setup:
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
         index:  test
@@ -26,8 +26,8 @@ setup:
 ---
 "Test use_field":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       catch: bad_request
       search:
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/20_phrase_field_match_only_text.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/20_phrase_field_match_only_text.yml
index aff2b3f11101c..90596ca04205c 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/20_phrase_field_match_only_text.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/20_phrase_field_match_only_text.yml
@@ -2,8 +2,8 @@
 
 setup:
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
         index: test
@@ -122,8 +122,8 @@ setup:
 ---
 "breaks ties by sorting terms":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   # This runs the suggester without bigrams so we can be sure of the sort order
   - do:
       search:
@@ -181,8 +181,8 @@ setup:
 ---
 "doesn't fail when asked to run on a field without unigrams when force_unigrams=false":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       search:
         rest_total_hits_as_int: true
@@ -213,8 +213,8 @@ setup:
 ---
 "reverse suggestions":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       search:
         rest_total_hits_as_int: true
diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java
index bb3d4bca47859..a48cfd87b78c3 100644
--- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java
+++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java
@@ -88,16 +88,18 @@ public IngestDocument execute(IngestDocument document) {
                 throw new IllegalArgumentException("cannot remove metadata field [" + path + "]");
             }
             // removing _id is disallowed when there's an external version specified in the request
-            String versionType = document.getFieldValue(IngestDocument.Metadata.VERSION_TYPE.getFieldName(), String.class);
             if (path.equals(IngestDocument.Metadata.ID.getFieldName())
-                && !Objects.equals(versionType, VersionType.toString(VersionType.INTERNAL))) {
-                Long version = document.getFieldValue(IngestDocument.Metadata.VERSION.getFieldName(), Long.class);
-                throw new IllegalArgumentException(
-                    "cannot remove metadata field [_id] when specifying external version for the document, version: "
-                        + version
-                        + ", version_type: "
-                        + versionType
-                );
+                && document.hasField(IngestDocument.Metadata.VERSION_TYPE.getFieldName())) {
+                String versionType = document.getFieldValue(IngestDocument.Metadata.VERSION_TYPE.getFieldName(), String.class);
+                if (!Objects.equals(versionType, VersionType.toString(VersionType.INTERNAL))) {
+                    Long version = document.getFieldValue(IngestDocument.Metadata.VERSION.getFieldName(), Long.class, true);
+                    throw new IllegalArgumentException(
+                        "cannot remove metadata field [_id] when specifying external version for the document, version: "
+                            + version
+                            + ", version_type: "
+                            + versionType
+                    );
+                }
             }
             document.removeField(path);
         });
diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java
index 1a5630a4730f2..c138ad606d2e5 100644
--- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java
+++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.ingest.common;
 
+import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.index.VersionType;
 import org.opensearch.ingest.IngestDocument;
 import org.opensearch.ingest.Processor;
@@ -181,4 +182,100 @@ public void testRemoveMetadataField() throws Exception {
                     }
         }
     }
+
+    public void testRemoveDocumentId() throws Exception {
+        Map<String, Object> config = new HashMap<>();
+        config.put("field", IngestDocument.Metadata.ID.getFieldName());
+        String processorTag = randomAlphaOfLength(10);
+
+        // test remove _id when _version_type is external
+        IngestDocument ingestDocumentWithExternalVersionType = new IngestDocument(
+            RandomDocumentPicks.randomString(random()),
+            RandomDocumentPicks.randomString(random()),
+            RandomDocumentPicks.randomString(random()),
+            1L,
+            VersionType.EXTERNAL,
+            RandomDocumentPicks.randomSource(random())
+        );
+
+        Processor processorForExternalVersionType = new RemoveProcessor.Factory(TestTemplateService.instance()).create(
+            null,
+            processorTag,
+            null,
+            config
+        );
+        assertThrows(
+            "cannot remove metadata field [_id] when specifying external version for the document, version: "
+                + 1
+                + ", version_type: "
+                + VersionType.EXTERNAL,
+            IllegalArgumentException.class,
+            () -> processorForExternalVersionType.execute(ingestDocumentWithExternalVersionType)
+        );
+
+        // test remove _id when _version_type is external_gte
+        config.put("field", IngestDocument.Metadata.ID.getFieldName());
+        IngestDocument ingestDocumentWithExternalGTEVersionType = new IngestDocument(
+            RandomDocumentPicks.randomString(random()),
+            RandomDocumentPicks.randomString(random()),
+            RandomDocumentPicks.randomString(random()),
+            1L,
+            VersionType.EXTERNAL_GTE,
+            RandomDocumentPicks.randomSource(random())
+        );
+
+        Processor processorForExternalGTEVersionType = new RemoveProcessor.Factory(TestTemplateService.instance()).create(
+            null,
+            processorTag,
+            null,
+            config
+        );
+        assertThrows(
+            "cannot remove metadata field [_id] when specifying external version for the document, version: "
+                + 1
+                + ", version_type: "
+                + VersionType.EXTERNAL_GTE,
+            IllegalArgumentException.class,
+            () -> processorForExternalGTEVersionType.execute(ingestDocumentWithExternalGTEVersionType)
+        );
+
+        // test remove _id when _version_type is internal
+        config.put("field", IngestDocument.Metadata.ID.getFieldName());
+        IngestDocument ingestDocumentWithInternalVersionType = new IngestDocument(
+            RandomDocumentPicks.randomString(random()),
+            RandomDocumentPicks.randomString(random()),
+            RandomDocumentPicks.randomString(random()),
+            Versions.MATCH_ANY,
+            VersionType.INTERNAL,
+            RandomDocumentPicks.randomSource(random())
+        );
+
+        Processor processorForInternalVersionType = new RemoveProcessor.Factory(TestTemplateService.instance()).create(
+            null,
+            processorTag,
+            null,
+            config
+        );
+        processorForInternalVersionType.execute(ingestDocumentWithInternalVersionType);
+        assertThat(ingestDocumentWithInternalVersionType.hasField(IngestDocument.Metadata.ID.getFieldName()), equalTo(false));
+
+        // test remove _id when _version_type is null
+        config.put("field", IngestDocument.Metadata.ID.getFieldName());
+        IngestDocument ingestDocumentWithNoVersionType = new IngestDocument(
+            RandomDocumentPicks.randomString(random()),
+            RandomDocumentPicks.randomString(random()),
+            RandomDocumentPicks.randomString(random()),
+            null,
+            null,
+            RandomDocumentPicks.randomSource(random())
+        );
+        Processor processorForNullVersionType = new RemoveProcessor.Factory(TestTemplateService.instance()).create(
+            null,
+            processorTag,
+            null,
+            config
+        );
+        processorForNullVersionType.execute(ingestDocumentWithNoVersionType);
+        assertThat(ingestDocumentWithNoVersionType.hasField(IngestDocument.Metadata.ID.getFieldName()), equalTo(false));
+    }
 }
diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_remove_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_remove_processor.yml
index 4811769d04f0e..6668b468f8edc 100644
--- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_remove_processor.yml
+++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_remove_processor.yml
@@ -5,6 +5,69 @@ teardown:
         id: "my_pipeline"
         ignore: 404
 
+---
+"Test simulate API works well with remove processor":
+  - do:
+      ingest.put_pipeline:
+        id: "my_pipeline"
+        body:  >
+          {
+            "description": "_description",
+            "processors": [
+              {
+                "remove" : {
+                  "field" : "{{foo}}"
+                }
+              }
+            ]
+          }
+  - match: { acknowledged: true }
+
+  # test simulating existing pipeline works well
+  - do:
+      ingest.simulate:
+        id: "my_pipeline"
+        body: >
+          {
+            "docs": [
+              {
+                "_source": {
+                  "foo": "bar",
+                  "bar": "zoo"
+                }
+              }
+            ]
+          }
+  - length: { docs: 1 }
+  - match: { docs.0.doc._source: { "foo": "bar" } }
+
+  # test simulating inflight pipeline works well
+  - do:
+      ingest.simulate:
+        body: >
+          {
+            "pipeline": {
+              "description": "_description",
+              "processors": [
+                {
+                  "remove" : {
+                    "field" : "{{foo}}"
+                  }
+                }
+              ]
+            },
+            "docs": [
+              {
+                "_source": {
+                  "foo": "bar",
+                  "bar": "zoo"
+                }
+              }
+            ]
+          }
+  - length: { docs: 1 }
+  - match: { docs.0.doc._source: { "foo": "bar" } }
+
 ---
 "Test remove processor with non-existing field and without ignore_missing":
   - do:
@@ -227,3 +290,32 @@ teardown:
         version: 1
         version_type: "external"
         body: { message: "foo bar baz" }
+
+  # test simulating pipeline with removing _id
+  - do:
+      ingest.simulate:
+        body: >
+          {
+            "pipeline": {
+              "description": "_description",
+              "processors": [
+                {
+                  "remove" : {
+                    "field" : "_id"
+                  }
+                }
+              ]
+            },
+            "docs": [
+              {
+                "_version_type": "external_gte",
+                "_version": 1,
+                "_source": {
+                  "foo": "bar",
+                  "bar": "zoo"
+                }
+              }
+            ]
+          }
+  - match: { docs.0.error.type: "illegal_argument_exception" }
+  - match: { docs.0.error.reason: "cannot remove metadata field [_id] when specifying external version for the document, version: 1, version_type: external_gte" }
diff --git a/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/ScaledFloatFieldMapper.java
index 7be241017f683..400d867296e5f 100644
--- a/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/ScaledFloatFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/ScaledFloatFieldMapper.java
@@ -199,9 +199,9 @@ public String typeName() {
 
         @Override
         public Query termQuery(Object value, QueryShardContext context) {
-            failIfNotIndexed();
+            failIfNotIndexedAndNoDocValues();
             long scaledValue = Math.round(scale(value));
-            Query query = NumberFieldMapper.NumberType.LONG.termQuery(name(), scaledValue);
+            Query query = NumberFieldMapper.NumberType.LONG.termQuery(name(), scaledValue, hasDocValues(), isSearchable());
             if (boost() != 1f) {
                 query = new BoostQuery(query, boost());
             }
@@ -210,13 +210,18 @@ public Query termQuery(Object value, QueryShardContext context) {
 
         @Override
         public Query termsQuery(List<?> values, QueryShardContext context) {
-            failIfNotIndexed();
+            failIfNotIndexedAndNoDocValues();
             List<Long> scaledValues = new ArrayList<>(values.size());
             for (Object value : values) {
                 long scaledValue = Math.round(scale(value));
                 scaledValues.add(scaledValue);
             }
-            Query query = NumberFieldMapper.NumberType.LONG.termsQuery(name(), Collections.unmodifiableList(scaledValues));
+            Query query = NumberFieldMapper.NumberType.LONG.termsQuery(
+                name(),
+                Collections.unmodifiableList(scaledValues),
+                hasDocValues(),
+                isSearchable()
+            );
             if (boost() != 1f) {
                 query = new BoostQuery(query, boost());
             }
@@ -225,7 +230,7 @@ public Query termsQuery(List<?> values, QueryShardContext context) {
 
         @Override
         public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, QueryShardContext context) {
-            failIfNotIndexed();
+            failIfNotIndexedAndNoDocValues();
             Long lo = null;
             if (lowerTerm != null) {
                 double dValue = scale(lowerTerm);
@@ -242,7 +247,7 @@ public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower
                 }
                 hi = Math.round(Math.floor(dValue));
             }
-            Query query = NumberFieldMapper.NumberType.LONG.rangeQuery(name(), lo, hi, true, true, hasDocValues(), context);
+            Query query = NumberFieldMapper.NumberType.LONG.rangeQuery(name(), lo, hi, true, true, hasDocValues(), isSearchable(), context);
             if (boost() != 1f) {
                 query = new BoostQuery(query, boost());
             }
diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java
index be12c49321b87..d83811e6668eb 100644
--- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java
+++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java
@@ -34,11 +34,13 @@
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.DoublePoint;
+import org.apache.lucene.document.LongField;
 import org.apache.lucene.document.LongPoint;
 import org.apache.lucene.document.SortedNumericDocValuesField;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.IndexOrDocValuesQuery;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.store.Directory;
@@ -63,7 +65,9 @@ public void testTermQuery() {
         );
         double value = (randomDouble() * 2 - 1) * 10000;
         long scaledValue = Math.round(value * ft.getScalingFactor());
-        assertEquals(LongPoint.newExactQuery("scaled_float", scaledValue), ft.termQuery(value, null));
+        Query dvQuery = SortedNumericDocValuesField.newSlowExactQuery("scaled_float", scaledValue);
+        Query query = new IndexOrDocValuesQuery(LongPoint.newExactQuery("scaled_float", scaledValue), dvQuery);
+        assertEquals(query, ft.termQuery(value, null));
     }
 
     public void testTermsQuery() {
@@ -75,7 +79,7 @@ public void testTermsQuery() {
         long scaledValue1 = Math.round(value1 * ft.getScalingFactor());
         double value2 = (randomDouble() * 2 - 1) * 10000;
         long scaledValue2 = Math.round(value2 * ft.getScalingFactor());
-        assertEquals(LongPoint.newSetQuery("scaled_float", scaledValue1, scaledValue2), ft.termsQuery(Arrays.asList(value1, value2), null));
+        assertEquals(LongField.newSetQuery("scaled_float", scaledValue1, scaledValue2), ft.termsQuery(Arrays.asList(value1, value2), null));
     }
 
     public void testRangeQuery() throws IOException {
@@ -112,7 +116,16 @@ public void testRangeQuery() throws IOException {
             Double u = randomBoolean() ? null : (randomDouble() * 2 - 1) * 10000;
             boolean includeLower = randomBoolean();
             boolean includeUpper = randomBoolean();
-            Query doubleQ = NumberFieldMapper.NumberType.DOUBLE.rangeQuery("double", l, u, includeLower, includeUpper, false, MOCK_QSC);
+            Query doubleQ = NumberFieldMapper.NumberType.DOUBLE.rangeQuery(
+                "double",
+                l,
+                u,
+                includeLower,
+                includeUpper,
+                false,
+                true,
+                MOCK_QSC
+            );
             Query scaledFloatQ = ft.rangeQuery(l, u, includeLower, includeUpper, MOCK_QSC);
             assertEquals(searcher.count(doubleQ), searcher.count(scaledFloatQ));
         }
diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting_field_match_only_text.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting_field_match_only_text.yml
index 3cb8e09c70aed..1d6a938675e39 100644
--- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting_field_match_only_text.yml
+++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting_field_match_only_text.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
 
   - do:
       indices.create:
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.101.Final.jar.sha1
deleted file mode 100644
index 7bb27bbfcb87d..0000000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4d94fd6cdf7a37b15237e32434afd6b955cc591
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..30f215e47f8ad
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.101.Final.jar.sha1
deleted file mode 100644
index c792b4e834030..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-642523c57c4be15b8b461be7b1532262d193bbb3
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..9ed9b896d4b4e
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.101.Final.jar.sha1
deleted file mode 100644
index 8bf31f6c3a2c7..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c648f863b301e3fc62d0de098ec61be7628b8ea2
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..478e7cfba1470
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
deleted file mode 100644
index 48b42bfab9287..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-40590da6c615b852384542051330e9fd51d4c4b1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..f0242709f34f7
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.101.Final.jar.sha1
deleted file mode 100644
index f4fe86799eaff..0000000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bdb16e4d308b5757123decc886896815d1daf7a3
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..1b533eea3b3b3
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.101.Final.jar.sha1
deleted file mode 100644
index cfc0befee237a..0000000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7800aea949bf95f63df73166d144e49405b279dd
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..70777be4dc636
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.101.Final.jar.sha1
deleted file mode 100644
index f4425d5ac8e5f..0000000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e7eddfa4dfffcbd375d265d1fd08297df94f82f
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..d7c15af9312fe
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.101.Final.jar.sha1
deleted file mode 100644
index fd9199092452b..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b36cc2337b4a4135df7ee2f2d77431c3b541dc5
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..5cacaf11a29ce
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
deleted file mode 100644
index 291c87ad7987b..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0697ef1d71c6111a1b18a387fa985fd6398ace2
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..64797bf11aedc
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java
index 6475a0b744c60..75d30aa9797c0 100644
--- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java
+++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java
@@ -46,6 +46,7 @@
 import io.netty.channel.ChannelPipeline;
 
 public class Netty4HttpChannel implements HttpChannel {
+    private static final String CHANNEL_PROPERTY = "channel";
 
     private final Channel channel;
     private final CompletableContext<Void> closeContext = new CompletableContext<>();
@@ -102,6 +103,10 @@ public Channel getNettyChannel() {
     @SuppressWarnings("unchecked")
     @Override
     public <T> Optional<T> get(String name, Class<T> clazz) {
+        if (CHANNEL_PROPERTY.equalsIgnoreCase(name) && clazz.isAssignableFrom(Channel.class)) {
+            return (Optional<T>) Optional.of(getNettyChannel());
+        }
+
         Object handler = getNettyChannel().pipeline().get(name);
 
         if (handler == null && inboundPipeline() != null) {
diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpChannelTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpChannelTests.java
new file mode 100644
index 0000000000000..c49166a51c24a
--- /dev/null
+++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpChannelTests.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.http.netty4;
+
+import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.transport.Netty4NioSocketChannel;
+import org.junit.Before;
+
+import java.util.Optional;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelOutboundInvoker;
+import io.netty.channel.ServerChannel;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+
+public class Netty4HttpChannelTests extends OpenSearchTestCase {
+    private Netty4HttpChannel netty4HttpChannel;
+    private Channel channel;
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        channel = new Netty4NioSocketChannel();
+        netty4HttpChannel = new Netty4HttpChannel(channel);
+    }
+
+    public void testChannelAttributeMatchesChannel() {
+        final Optional<Channel> channelOpt = netty4HttpChannel.get("channel", Channel.class);
+        assertThat(channelOpt.isPresent(), is(true));
+        assertThat(channelOpt.get(), sameInstance(channel));
+    }
+
+    public void testChannelAttributeMatchesChannelOutboundInvoker() {
+        final Optional<ChannelOutboundInvoker> channelOpt = netty4HttpChannel.get("channel", ChannelOutboundInvoker.class);
+        assertThat(channelOpt.isPresent(), is(true));
+        assertThat(channelOpt.get(), sameInstance(channel));
+    }
+
+    public void testChannelAttributeIsEmpty() {
+        final Optional<ServerChannel> channelOpt = netty4HttpChannel.get("channel", ServerChannel.class);
+        assertThat(channelOpt.isEmpty(), is(true));
+    }
+}
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.101.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.101.Final.jar.sha1
deleted file mode 100644
index 0789dea62778a..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-dns-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24d0f4f2b0b0b55acc498d62f9c0921d0ea6da7b
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..0232fc58f9357
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+8e237ce67ab230ed1ba749d6651b278333c21b3f
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.101.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
deleted file mode 100644
index 48b42bfab9287..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-40590da6c615b852384542051330e9fd51d4c4b1
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..f0242709f34f7
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.101.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.101.Final.jar.sha1
deleted file mode 100644
index fb2d1aa25a5ec..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cbaac9e2c2d7b86e4c1bda220cde49949c9bcaee
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..3b6cd3524d978
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5b126ceba61275f38297cacd5ea0cd6d3addee04
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.101.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.101.Final.jar.sha1
deleted file mode 100644
index ca030677c32d0..0000000000000
--- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c198ee61abba7ae6b3cb6b1033f04fb0ae79d512
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..9d01e814971f2
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+50a2d899a8f8a68daed1a9b6d7750184310cc45f
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.101.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.101.Final.jar.sha1
deleted file mode 100644
index 450c34d975bb9..0000000000000
--- a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d3f503d7554cf25edc6b83b9b4724b240c6e91d5
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..987b524aedc98
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+f1210e5856fecb9182d58c0d33fa6e946b344b40
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
deleted file mode 100644
index 291c87ad7987b..0000000000000
--- a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0697ef1d71c6111a1b18a387fa985fd6398ace2
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..64797bf11aedc
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
index f04d42a2155d6..36843e3bc8700 100644
--- a/plugins/repository-hdfs/build.gradle
+++ b/plugins/repository-hdfs/build.gradle
@@ -75,7 +75,7 @@ dependencies {
   api 'commons-collections:commons-collections:3.2.2'
   api "org.apache.commons:commons-compress:${versions.commonscompress}"
   api 'org.apache.commons:commons-configuration2:2.9.0'
-  api 'commons-io:commons-io:2.14.0'
+  api 'commons-io:commons-io:2.15.1'
   api 'org.apache.commons:commons-lang3:3.14.0'
   implementation 'com.google.re2j:re2j:1.7'
   api 'javax.servlet:servlet-api:2.5'
diff --git a/plugins/repository-hdfs/licenses/commons-io-2.14.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-io-2.14.0.jar.sha1
deleted file mode 100644
index 33c5cfe53e01d..0000000000000
--- a/plugins/repository-hdfs/licenses/commons-io-2.14.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4c6e1f6c196339473cd2e1b037f0eb97c62755b
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/commons-io-2.15.1.jar.sha1 b/plugins/repository-hdfs/licenses/commons-io-2.15.1.jar.sha1
new file mode 100644
index 0000000000000..47c5d13812a36
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/commons-io-2.15.1.jar.sha1
@@ -0,0 +1 @@
+f11560da189ab563a5c8e351941415430e9304ea
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.101.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.101.Final.jar.sha1
deleted file mode 100644
index 093ced04bee4b..0000000000000
--- a/plugins/repository-hdfs/licenses/netty-all-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2761d380bc97e6ce64745dd9ca04538cedd40a5b
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..9110503f67304
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+d75246285e5fac6f6dad47e387ed4f46f36e521d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.101.Final.jar.sha1
deleted file mode 100644
index 7bb27bbfcb87d..0000000000000
--- a/plugins/repository-s3/licenses/netty-buffer-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4d94fd6cdf7a37b15237e32434afd6b955cc591
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..30f215e47f8ad
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.101.Final.jar.sha1
deleted file mode 100644
index c792b4e834030..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-642523c57c4be15b8b461be7b1532262d193bbb3
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..9ed9b896d4b4e
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.101.Final.jar.sha1
deleted file mode 100644
index 8bf31f6c3a2c7..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-http-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c648f863b301e3fc62d0de098ec61be7628b8ea2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..478e7cfba1470
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
deleted file mode 100644
index 48b42bfab9287..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-40590da6c615b852384542051330e9fd51d4c4b1
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..f0242709f34f7
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.101.Final.jar.sha1
deleted file mode 100644
index f4fe86799eaff..0000000000000
--- a/plugins/repository-s3/licenses/netty-common-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bdb16e4d308b5757123decc886896815d1daf7a3
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..1b533eea3b3b3
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.101.Final.jar.sha1
deleted file mode 100644
index cfc0befee237a..0000000000000
--- a/plugins/repository-s3/licenses/netty-handler-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7800aea949bf95f63df73166d144e49405b279dd
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..70777be4dc636
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.101.Final.jar.sha1
deleted file mode 100644
index f4425d5ac8e5f..0000000000000
--- a/plugins/repository-s3/licenses/netty-resolver-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e7eddfa4dfffcbd375d265d1fd08297df94f82f
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..d7c15af9312fe
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.101.Final.jar.sha1
deleted file mode 100644
index fd9199092452b..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b36cc2337b4a4135df7ee2f2d77431c3b541dc5
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..5cacaf11a29ce
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.101.Final.jar.sha1
deleted file mode 100644
index a710d964c1803..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f86303830ab65680e45cabb531e37078ecc6791e
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..522d85a3bf12e
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+700fdbabab44709b0eccffe8f91c4226a5787356
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
deleted file mode 100644
index 291c87ad7987b..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0697ef1d71c6111a1b18a387fa985fd6398ace2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..64797bf11aedc
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.101.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.101.Final.jar.sha1
deleted file mode 100644
index 7bb27bbfcb87d..0000000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4d94fd6cdf7a37b15237e32434afd6b955cc591
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..30f215e47f8ad
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.101.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.101.Final.jar.sha1
deleted file mode 100644
index c792b4e834030..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-642523c57c4be15b8b461be7b1532262d193bbb3
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..9ed9b896d4b4e
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.101.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.101.Final.jar.sha1
deleted file mode 100644
index 8bf31f6c3a2c7..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c648f863b301e3fc62d0de098ec61be7628b8ea2
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..478e7cfba1470
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.101.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.101.Final.jar.sha1
deleted file mode 100644
index f4fe86799eaff..0000000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bdb16e4d308b5757123decc886896815d1daf7a3
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..1b533eea3b3b3
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.101.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.101.Final.jar.sha1
deleted file mode 100644
index cfc0befee237a..0000000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7800aea949bf95f63df73166d144e49405b279dd
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..70777be4dc636
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.101.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.101.Final.jar.sha1
deleted file mode 100644
index f4425d5ac8e5f..0000000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e7eddfa4dfffcbd375d265d1fd08297df94f82f
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..d7c15af9312fe
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.101.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.101.Final.jar.sha1
deleted file mode 100644
index fd9199092452b..0000000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b36cc2337b4a4135df7ee2f2d77431c3b541dc5
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..5cacaf11a29ce
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.101.Final.jar.sha1
deleted file mode 100644
index 7bb27bbfcb87d..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4d94fd6cdf7a37b15237e32434afd6b955cc591
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..30f215e47f8ad
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.101.Final.jar.sha1
deleted file mode 100644
index c792b4e834030..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-642523c57c4be15b8b461be7b1532262d193bbb3
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..9ed9b896d4b4e
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.101.Final.jar.sha1
deleted file mode 100644
index 0789dea62778a..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24d0f4f2b0b0b55acc498d62f9c0921d0ea6da7b
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..0232fc58f9357
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+8e237ce67ab230ed1ba749d6651b278333c21b3f
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.101.Final.jar.sha1
deleted file mode 100644
index 8bf31f6c3a2c7..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c648f863b301e3fc62d0de098ec61be7628b8ea2
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..478e7cfba1470
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
deleted file mode 100644
index 48b42bfab9287..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-40590da6c615b852384542051330e9fd51d4c4b1
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..f0242709f34f7
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.101.Final.jar.sha1
deleted file mode 100644
index f4fe86799eaff..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bdb16e4d308b5757123decc886896815d1daf7a3
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..1b533eea3b3b3
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.101.Final.jar.sha1
deleted file mode 100644
index cfc0befee237a..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7800aea949bf95f63df73166d144e49405b279dd
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..70777be4dc636
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.101.Final.jar.sha1
deleted file mode 100644
index f4425d5ac8e5f..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e7eddfa4dfffcbd375d265d1fd08297df94f82f
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..d7c15af9312fe
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.101.Final.jar.sha1
deleted file mode 100644
index 450c34d975bb9..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d3f503d7554cf25edc6b83b9b4724b240c6e91d5
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..987b524aedc98
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+f1210e5856fecb9182d58c0d33fa6e946b344b40
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.101.Final.jar.sha1
deleted file mode 100644
index fd9199092452b..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b36cc2337b4a4135df7ee2f2d77431c3b541dc5
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..5cacaf11a29ce
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
deleted file mode 100644
index 291c87ad7987b..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.101.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d0697ef1d71c6111a1b18a387fa985fd6398ace2
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
new file mode 100644
index 0000000000000..64797bf11aedc
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
@@ -0,0 +1 @@
+d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
index f80c9f9c0bc80..b572ed9e62ea9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
@@ -1,13 +1,103 @@
 "Help":
   - skip:
-      version: " - 2.3.99"
+      version: " - 2.11.99"
+      reason:  deleted docs added in 2.12.0
+      features: node_selector
+  - do:
+      cat.shards:
+        help: true
+      node_selector:
+        version: "2.12.0 - "
+
+  - match:
+      $body: |
+        /^   index                            .+   \n
+             shard                            .+   \n
+             prirep                           .+   \n
+             state                            .+   \n
+             docs                             .+   \n
+             store                            .+   \n
+             ip                               .+   \n
+             id                               .+   \n
+             node                             .+   \n
+             sync_id                          .+   \n
+             unassigned.reason                .+   \n
+             unassigned.at                    .+   \n
+             unassigned.for                   .+   \n
+             unassigned.details               .+   \n
+             recoverysource.type              .+   \n
+             completion.size                  .+   \n
+             fielddata.memory_size            .+   \n
+             fielddata.evictions              .+   \n
+             query_cache.memory_size          .+   \n
+             query_cache.evictions            .+   \n
+             flush.total                      .+   \n
+             flush.total_time                 .+   \n
+             get.current                      .+   \n
+             get.time                         .+   \n
+             get.total                        .+   \n
+             get.exists_time                  .+   \n
+             get.exists_total                 .+   \n
+             get.missing_time                 .+   \n
+             get.missing_total                .+   \n
+             indexing.delete_current          .+   \n
+             indexing.delete_time             .+   \n
+             indexing.delete_total            .+   \n
+             indexing.index_current           .+   \n
+             indexing.index_time              .+   \n
+             indexing.index_total             .+   \n
+             indexing.index_failed            .+   \n
+             merges.current                   .+   \n
+             merges.current_docs              .+   \n
+             merges.current_size              .+   \n
+             merges.total                     .+   \n
+             merges.total_docs                .+   \n
+             merges.total_size                .+   \n
+             merges.total_time                .+   \n
+             refresh.total                    .+   \n
+             refresh.time                     .+   \n
+             refresh.external_total           .+   \n
+             refresh.external_time            .+   \n
+             refresh.listeners                .+   \n
+             search.fetch_current             .+   \n
+             search.fetch_time                .+   \n
+             search.fetch_total               .+   \n
+             search.open_contexts             .+   \n
+             search.query_current             .+   \n
+             search.query_time                .+   \n
+             search.query_total               .+   \n
+             search.scroll_current            .+   \n
+             search.scroll_time               .+   \n
+             search.scroll_total              .+   \n
+             search.point_in_time_current     .+   \n
+             search.point_in_time_time        .+   \n
+             search.point_in_time_total       .+   \n
+             segments.count                   .+   \n
+             segments.memory                  .+   \n
+             segments.index_writer_memory     .+   \n
+             segments.version_map_memory      .+   \n
+             segments.fixed_bitset_memory     .+   \n
+             seq_no.max                       .+   \n
+             seq_no.local_checkpoint          .+   \n
+             seq_no.global_checkpoint         .+   \n
+             warmer.current                   .+   \n
+             warmer.total                     .+   \n
+             warmer.total_time                .+   \n
+             path.data                        .+   \n
+             path.state                       .+   \n
+             docs.deleted                     .+   \n
+        $/
+---
+"Help from 2.4.0 to 2.11.0":
+  - skip:
+      version: " - 2.3.99 , 2.12.0 - "
       reason:  point in time stats were added in 2.4.0
       features: node_selector
   - do:
       cat.shards:
         help: true
       node_selector:
-        version: "2.4.0 - "
+        version: "2.4.0 - 2.11.99"
 
   - match:
       $body: |
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/40_remove_with_must_exist.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/40_remove_with_must_exist.yml
new file mode 100644
index 0000000000000..dbf6a4fad3295
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/40_remove_with_must_exist.yml
@@ -0,0 +1,141 @@
+---
+"Throw aliases missing exception when removing non-existing alias with setting must_exist to true":
+  - skip:
+      version: " - 2.99.99"
+      reason: "introduced in 3.0"
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      indices.exists_alias:
+        name: test_alias
+
+  - is_false: ''
+
+  - do:
+      catch: /aliases \[test_alias\] missing/
+      indices.update_aliases:
+        body:
+          actions:
+            - remove:
+                index: test_index
+                alias: test_alias
+                must_exist: true
+
+  - do:
+      catch: /aliases \[testAlias\*\] missing/
+      indices.update_aliases:
+        body:
+          actions:
+            - remove:
+                index: test_index
+                aliases: [ testAlias* ]
+                must_exist: true
+
+  - do:
+      catch: /\[aliases\] can't be empty/
+      indices.update_aliases:
+        body:
+          actions:
+            - remove:
+                index: test_index
+                aliases: []
+                must_exist: true
+
+---
+"Throw aliases missing exception when all of the specified aliases are non-existing":
+  - skip:
+      version: " - 2.99.99"
+      reason: "introduced in 3.0"
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      indices.exists_alias:
+        name: test_alias
+
+  - is_false: ''
+
+  - do:
+      catch: /aliases \[test\_alias\] missing/
+      indices.update_aliases:
+        body:
+          actions:
+            - remove:
+                index: test_index
+                alias: test_alias
+
+  - do:
+      catch: /aliases \[test\_alias\*\] missing/
+      indices.update_aliases:
+        body:
+          actions:
+            - remove:
+                indices: [ test_index ]
+                aliases: [ test_alias* ]
+
+---
+"Remove successfully when some specified aliases are non-existing":
+  - skip:
+      version: " - 2.99.99"
+      reason: "introduced in 3.0"
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      indices.exists_alias:
+        name: test_alias
+
+  - is_false: ''
+
+  - do:
+      indices.update_aliases:
+        body:
+          actions:
+            - add:
+                indices: [ test_index ]
+                aliases: [ test_alias ]
+
+  - do:
+      indices.update_aliases:
+        body:
+          actions:
+            - remove:
+                index: test_index
+                aliases: [test_alias, test_alias1, test_alias2]
+                must_exist: false
+
+  - match: { acknowledged: true }
+
+---
+"Remove silently when all of the specified aliases are non-existing and must_exist is false":
+  - skip:
+      version: " - 2.99.99"
+      reason: "introduced in 3.0"
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      indices.exists_alias:
+        name: test_alias
+
+  - is_false: ''
+
+  - do:
+      indices.update_aliases:
+        body:
+          actions:
+            - remove:
+                index: test_index
+                aliases: [test_alias, test_alias1, test_alias2]
+                must_exist: false
+
+  - match: { acknowledged: true }
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string_field_match_only_text.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string_field_match_only_text.yml
index 085c5633ac72b..044ae5dd6a94d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string_field_match_only_text.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string_field_match_only_text.yml
@@ -1,8 +1,8 @@
 ---
 "validate_query with query_string parameters":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
           index:  test
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms_field_match_only_text.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms_field_match_only_text.yml
index 7a96536a2e261..d1cc6c8295bd9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms_field_match_only_text.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms_field_match_only_text.yml
@@ -1,8 +1,8 @@
 ---
 "Default index":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
           index:  goodbad
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/90_sig_text_field_match_only_text.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/90_sig_text_field_match_only_text.yml
index bc41f157dfdc4..e21c4fb946d85 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/90_sig_text_field_match_only_text.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/90_sig_text_field_match_only_text.yml
@@ -1,8 +1,8 @@
 ---
 "Default index":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
           index:  goodbad
@@ -78,8 +78,8 @@
 ---
 "Dedup noise":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
           index:  goodbad
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/20_highlighting_field_match_only_text.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/20_highlighting_field_match_only_text.yml
index 7100d620bf19e..9e60d69bfedd7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/20_highlighting_field_match_only_text.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/20_highlighting_field_match_only_text.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
   - do:
       indices.create:
         index: test
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query_match_only_text.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query_match_only_text.yml
index 03626236604a1..69c639a8f506a 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query_match_only_text.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query_match_only_text.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
       features: ["headers"]
 
   - do:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_phrase_search_field_match_only_text.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_phrase_search_field_match_only_text.yml
index a41b8d353e3e9..13fd6b3858948 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_phrase_search_field_match_only_text.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_phrase_search_field_match_only_text.yml
@@ -1,8 +1,8 @@
 ---
 "search with indexed phrases":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/310_match_bool_prefix_field_match_only_text.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/310_match_bool_prefix_field_match_only_text.yml
index fc4e9f9de0f38..682a7dded1e9b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/310_match_bool_prefix_field_match_only_text.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/310_match_bool_prefix_field_match_only_text.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/320_disallow_queries_field_match_only_text.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/320_disallow_queries_field_match_only_text.yml
index f4faf87eb83cc..00e54e43d6f04 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/320_disallow_queries_field_match_only_text.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/320_disallow_queries_field_match_only_text.yml
@@ -1,8 +1,8 @@
 ---
 setup:
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
 
   - do:
       indices.create:
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml
new file mode 100644
index 0000000000000..c7b00d5fbbef2
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml
@@ -0,0 +1,1147 @@
+setup:
+  - skip:
+      features: [ "headers" ]
+      version: " - 2.11.99"
+      reason: "searching with only doc_values was added in 2.12.0"
+---
+"search on fields with both index and doc_values enabled":
+  - do:
+      indices.create:
+        index: test-iodvq
+        body:
+          mappings:
+            properties:
+              some_keyword:
+                type: keyword
+                index: true
+                doc_values: true
+              byte:
+                type: byte
+                index: true
+                doc_values: true
+              double:
+                type: double
+                index: true
+                doc_values: true
+              float:
+                type: float
+                index: true
+                doc_values: true
+              half_float:
+                type: half_float
+                index: true
+                doc_values: true
+              integer:
+                type: integer
+                index: true
+                doc_values: true
+              long:
+                type: long
+                index: true
+                doc_values: true
+              short:
+                type: short
+                index: true
+                doc_values: true
+              unsigned_long:
+                type: unsigned_long
+                index: true
+                doc_values: true
+
+  - do:
+      bulk:
+        index: test-iodvq
+        refresh: true
+        body:
+          - '{"index": {"_index": "test-iodvq", "_id": "1" }}'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "index": { "_index": "test-iodvq", "_id": "2" }}'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "index": { "_index": "test-iodvq", "_id": "3" } }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            prefix:
+              some_keyword: "ing"
+
+  - match: { hits.hits.0._source.some_keyword: "ingesting some random keyword data" }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              "some_keyword": {
+                "lt": 500
+              } }
+
+  - match: { hits.total: 2 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              half_float: 400.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              float: 800.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              double: 100.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              byte: 120
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              short: 150
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              integer: 1291
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              long: 13456
+
+  - match: { hits.total: 1 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              unsigned_long: 10223372036854775800
+
+  - match: { hits.total: 1 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              half_float: [ 400.0, 401.0 ]
+
+  - match: { hits.total: 2 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              float: [ 800.0, 801.0 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              byte: [ 120, 121 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              double: [ 100.0, 101.0 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              short: [ 150, 151 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              integer: [ 1290, 1291 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              long: [ 13456, 13457 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              unsigned_long: [ 10223372036854775800, 10223372036854775801 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              half_float: {
+                gte: 401.0,
+                lte: 402.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              float: {
+                gte: 801.0,
+                lte: 802.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              byte: {
+                gte: 120,
+                lte: 121
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              double: {
+                gte: 101.0,
+                lte: 102.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              short: {
+                gte: 151,
+                lte: 152
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              integer: {
+                gte: 1291,
+                lte: 1292
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              long: {
+                gte: 13457,
+                lte: 13458
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range: {
+              unsigned_long: {
+                gte: 10223372036854775801,
+                lte: 10223372036854775802
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+---
+"search on fields with only index enabled":
+  - do:
+      indices.create:
+        index: test-index
+        body:
+          mappings:
+            properties:
+              some_keyword:
+                type: keyword
+                index: true
+                doc_values: false
+              byte:
+                type: byte
+                index: true
+                doc_values: false
+              double:
+                type: double
+                index: true
+                doc_values: false
+              float:
+                type: float
+                index: true
+                doc_values: false
+              half_float:
+                type: half_float
+                index: true
+                doc_values: false
+              integer:
+                type: integer
+                index: true
+                doc_values: false
+              long:
+                type: long
+                index: true
+                doc_values: false
+              short:
+                type: short
+                index: true
+                doc_values: false
+              unsigned_long:
+                type: unsigned_long
+                index: true
+                doc_values: false
+
+  - do:
+      bulk:
+        index: test-index
+        refresh: true
+        body:
+          - '{"index": {"_index": "test-index", "_id": "1" }}'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "index": { "_index": "test-index", "_id": "2" }}'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "index": { "_index": "test-index", "_id": "3" } }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            prefix:
+              some_keyword: "ing"
+
+  - match: { hits.hits.0._source.some_keyword: "ingesting some random keyword data" }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              "some_keyword": {
+                "lt": 500
+              } }
+
+  - match: { hits.total: 2 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              half_float: 400.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              float: 800.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              double: 100.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              byte: 120
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              short: 150
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              integer: 1291
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              long: 13456
+
+  - match: { hits.total: 1 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              unsigned_long: 10223372036854775800
+
+  - match: { hits.total: 1 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              half_float: [ 400.0, 401.0 ]
+
+  - match: { hits.total: 2 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              float: [ 800.0, 801.0 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              byte: [ 120, 121 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              double: [ 100.0, 101.0 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              short: [ 150, 151 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              integer: [ 1290, 1291 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              long: [ 13456, 13457 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              unsigned_long: [ 10223372036854775800, 10223372036854775801 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              half_float: {
+                gte: 401.0,
+                lte: 402.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              float: {
+                gte: 801.0,
+                lte: 802.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              byte: {
+                gte: 120,
+                lte: 121
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              double: {
+                gte: 101.0,
+                lte: 102.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              short: {
+                gte: 151,
+                lte: 152
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              integer: {
+                gte: 1291,
+                lte: 1292
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              long: {
+                gte: 13457,
+                lte: 13458
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range: {
+              unsigned_long: {
+                gte: 10223372036854775801,
+                lte: 10223372036854775802
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+---
+"search on fields with only doc_values enabled":
+  - do:
+      indices.create:
+        index: test-doc-values
+        body:
+          mappings:
+            properties:
+              some_keyword:
+                type: keyword
+                index: false
+                doc_values: true
+              byte:
+                type: byte
+                index: false
+                doc_values: true
+              double:
+                type: double
+                index: false
+                doc_values: true
+              float:
+                type: float
+                index: false
+                doc_values: true
+              half_float:
+                type: half_float
+                index: false
+                doc_values: true
+              integer:
+                type: integer
+                index: false
+                doc_values: true
+              long:
+                type: long
+                index: false
+                doc_values: true
+              short:
+                type: short
+                index: false
+                doc_values: true
+              unsigned_long:
+                type: unsigned_long
+                index: false
+                doc_values: true
+
+  - do:
+      bulk:
+        index: test-doc-values
+        refresh: true
+        body:
+          - '{"index": {"_index": "test-doc-values", "_id": "1" }}'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "index": { "_index": "test-doc-values", "_id": "2" }}'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "index": { "_index": "test-doc-values", "_id": "3" } }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            prefix:
+              some_keyword: "ing"
+
+  - match: { hits.hits.0._source.some_keyword: "ingesting some random keyword data" }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              "some_keyword": {
+                "lt": 500
+              } }
+
+  - match: { hits.total: 2 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              half_float: 400.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              float: 800.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              double: 100.0
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              byte: 120
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              short: 150
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              integer: 1291
+
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              long: 13456
+
+  - match: { hits.total: 1 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              unsigned_long: 10223372036854775800
+
+  - match: { hits.total: 1 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            terms:
+              half_float: [ 400.0, 401.0 ]
+
+  - match: { hits.total: 2 }
+
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            terms:
+              float: [ 800.0, 801.0 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            terms:
+              byte: [ 120, 121 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            terms:
+              double: [ 100.0, 101.0 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            terms:
+              short: [ 150, 151 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            terms:
+              integer: [ 1290, 1291 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            terms:
+              long: [ 13456, 13457 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            terms:
+              unsigned_long: [ 10223372036854775800, 10223372036854775801 ]
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              half_float: {
+                gte: 401.0,
+                lte: 402.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              float: {
+                gte: 801.0,
+                lte: 802.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              byte: {
+                gte: 120,
+                lte: 121
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              double: {
+                gte: 101.0,
+                lte: 102.0
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              short: {
+                gte: 151,
+                lte: 152
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              integer: {
+                gte: 1291,
+                lte: 1292
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              long: {
+                gte: 13457,
+                lte: 13458
+              },
+            }
+
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range: {
+              unsigned_long: {
+                gte: 10223372036854775801,
+                lte: 10223372036854775802
+              },
+            }
+
+  - match: { hits.total: 2 }
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_keyword_doc_values.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_keyword_doc_values.yml
deleted file mode 100644
index 8829e7b100fdd..0000000000000
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_keyword_doc_values.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-"search on keyword fields with doc_values enabled":
-  - do:
-      indices.create:
-        index: test
-        body:
-          mappings:
-            properties:
-              "some_keyword":
-                type: "keyword"
-                index: true
-                doc_values: true
-
-  - do:
-      bulk:
-        index: test
-        refresh: true
-        body:
-          - '{"index": {"_index": "test", "_id": "1" }}'
-          - '{ "some_keyword": "ingesting some random keyword data" }'
-          - '{ "index": { "_index": "test", "_id": "2" }}'
-          - '{ "some_keyword": "400" }'
-          - '{ "index": { "_index": "test", "_id": "3" } }'
-          - '{ "some_keyword": "5" }'
-
-  - do:
-      search:
-        index: test
-        body:
-          query:
-            prefix:
-              some_keyword: "ing"
-
-  - match: { hits.hits.0._source.some_keyword: "ingesting some random keyword data" }
-
-  - do:
-      search:
-        index: test
-        body:
-          query:
-            range: {
-              "some_keyword": {
-                "lt": 500
-              } }
-
-  - match: { hits.total.value: 2 }
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic_field_match_only_field.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic_field_match_only_field.yml
index cc15796e4697f..44adb48c8765e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic_field_match_only_field.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic_field_match_only_field.yml
@@ -1,8 +1,8 @@
 ---
 "Search shards aliases with and without filters":
   - skip:
-      version: " - 2.99.99"
-      reason: "match_only_text was added in 3.0"
+      version: " - 2.11.99"
+      reason: "match_only_text was added in 2.12"
 
   - do:
       indices.create:
diff --git a/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/AwarenessAllocationIT.java b/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/AwarenessAllocationIT.java
index c69718d982f8b..522d63b22a0da 100644
--- a/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/AwarenessAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/AwarenessAllocationIT.java
@@ -364,6 +364,7 @@ public void testAwarenessZonesIncrementalNodes() {
         assertThat(counts.get(noZoneNode), equalTo(2));
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/5908")
     public void testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness() throws Exception {
         int nodeCountPerAZ = 5;
         int numOfShards = 30;
diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationBaseIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationBaseIT.java
index 1d93eecd6b245..641f714d33414 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationBaseIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationBaseIT.java
@@ -60,11 +60,6 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
         return asList(MockTransportService.TestPlugin.class);
     }
 
-    @Override
-    protected boolean addMockInternalEngine() {
-        return false;
-    }
-
     @Override
     public Settings indexSettings() {
         return Settings.builder()
diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationClusterSettingIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationClusterSettingIT.java
index c4e8ccfc0ecec..f2cb7c9c6bfc8 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationClusterSettingIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationClusterSettingIT.java
@@ -52,11 +52,6 @@ public Settings indexSettings() {
             .build();
     }
 
-    @Override
-    protected boolean addMockInternalEngine() {
-        return false;
-    }
-
     public void testIndexReplicationSettingOverridesSegRepClusterSetting() throws Exception {
         Settings settings = Settings.builder().put(CLUSTER_SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT).build();
         final String ANOTHER_INDEX = "test-index";
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteIndexPrimaryRelocationIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteIndexPrimaryRelocationIT.java
index d8b7718a55377..67316ed0e6e6b 100644
--- a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteIndexPrimaryRelocationIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteIndexPrimaryRelocationIT.java
@@ -35,11 +35,6 @@ protected Settings nodeSettings(int nodeOrdinal) {
             .build();
     }
 
-    @Override
-    protected boolean addMockInternalEngine() {
-        return false;
-    }
-
     public Settings indexSettings() {
         return Settings.builder()
             .put(super.indexSettings())
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
index 8c15ebd0505d9..d23e634bb3368 100644
--- a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
+++ b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
@@ -121,11 +121,6 @@ protected Map<String, Long> indexData(int numberOfIterations, boolean invokeFlus
         return indexingStats;
     }
 
-    @Override
-    protected boolean addMockInternalEngine() {
-        return false;
-    }
-
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
         if (segmentRepoPath == null || translogRepoPath == null) {
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreStatsIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreStatsIT.java
index 2d3ab135d0377..4a0af206b9d89 100644
--- a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreStatsIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreStatsIT.java
@@ -29,6 +29,7 @@
 import org.opensearch.test.InternalTestCluster;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.test.disruption.NetworkDisruption;
+import org.opensearch.test.junit.annotations.TestLogging;
 import org.opensearch.test.transport.MockTransportService;
 
 import java.io.IOException;
@@ -249,6 +250,7 @@ public void testStatsResponseFromLocalNode() {
         }
     }
 
+    @TestLogging(reason = "Getting trace logs from remote store package", value = "org.opensearch.remotestore:TRACE")
     public void testDownloadStatsCorrectnessSinglePrimarySingleReplica() throws Exception {
         setup();
         // Scenario:
@@ -277,6 +279,13 @@ public void testDownloadStatsCorrectnessSinglePrimarySingleReplica() throws Exce
             .collect(Collectors.toList())
             .get(0)
             .getSegmentStats();
+        logger.info(
+            "Zero state primary stats: {}ms refresh time lag, {}b bytes lag, {}b upload bytes started and {}b upload bytes failed.",
+            zeroStatePrimaryStats.refreshTimeLagMs,
+            zeroStatePrimaryStats.bytesLag,
+            zeroStatePrimaryStats.uploadBytesStarted,
+            zeroStatePrimaryStats.uploadBytesFailed
+        );
         assertTrue(
             zeroStatePrimaryStats.totalUploadsStarted == zeroStatePrimaryStats.totalUploadsSucceeded
                 && zeroStatePrimaryStats.totalUploadsSucceeded == 1
@@ -339,6 +348,7 @@ public void testDownloadStatsCorrectnessSinglePrimarySingleReplica() throws Exce
         }
     }
 
+    @TestLogging(reason = "Getting trace logs from remote store package", value = "org.opensearch.remotestore:TRACE")
     public void testDownloadStatsCorrectnessSinglePrimaryMultipleReplicaShards() throws Exception {
         setup();
         // Scenario:
@@ -371,6 +381,13 @@ public void testDownloadStatsCorrectnessSinglePrimaryMultipleReplicaShards() thr
             .collect(Collectors.toList())
             .get(0)
             .getSegmentStats();
+        logger.info(
+            "Zero state primary stats: {}ms refresh time lag, {}b bytes lag, {}b upload bytes started and {}b upload bytes failed.",
+            zeroStatePrimaryStats.refreshTimeLagMs,
+            zeroStatePrimaryStats.bytesLag,
+            zeroStatePrimaryStats.uploadBytesStarted,
+            zeroStatePrimaryStats.uploadBytesFailed
+        );
         assertTrue(
             zeroStatePrimaryStats.totalUploadsStarted == zeroStatePrimaryStats.totalUploadsSucceeded
                 && zeroStatePrimaryStats.totalUploadsSucceeded == 1
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/SegmentReplicationUsingRemoteStoreDisruptionIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/SegmentReplicationUsingRemoteStoreDisruptionIT.java
index d5cdc22a15478..8372135fc55c4 100644
--- a/server/src/internalClusterTest/java/org/opensearch/remotestore/SegmentReplicationUsingRemoteStoreDisruptionIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/remotestore/SegmentReplicationUsingRemoteStoreDisruptionIT.java
@@ -44,11 +44,6 @@ public Settings indexSettings() {
         return remoteStoreIndexSettings(1);
     }
 
-    @Override
-    protected boolean addMockInternalEngine() {
-        return false;
-    }
-
     public void testCancelReplicationWhileSyncingSegments() throws Exception {
         Path location = randomRepoPath().toAbsolutePath();
         setup(location, 0d, "metadata", Long.MAX_VALUE, 1);
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.java
index 2c12c0abb202b..c649c4ab13e7e 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.java
@@ -74,11 +74,6 @@ public Settings restoreIndexDocRepSettings() {
         return Settings.builder().put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.DOCUMENT).build();
     }
 
-    @Override
-    protected boolean addMockInternalEngine() {
-        return false;
-    }
-
     public void ingestData(int docCount, String indexName) throws Exception {
         for (int i = 0; i < docCount; i++) {
             client().prepareIndex(indexName).setId(Integer.toString(i)).setSource("field", "value" + i).execute().actionGet();
diff --git a/server/src/main/java/org/apache/lucene/util/LongHashSet.java b/server/src/main/java/org/apache/lucene/util/LongHashSet.java
new file mode 100644
index 0000000000000..a463e8a189585
--- /dev/null
+++ b/server/src/main/java/org/apache/lucene/util/LongHashSet.java
@@ -0,0 +1,136 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.apache.lucene.util;
+
+import org.apache.lucene.util.packed.PackedInts;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+
+/** Set of longs, optimized for docvalues usage */
+public final class LongHashSet implements Accountable {
+    private static final long BASE_RAM_BYTES = RamUsageEstimator.shallowSizeOfInstance(LongHashSet.class);
+
+    private static final long MISSING = Long.MIN_VALUE;
+
+    final long[] table;
+    final int mask;
+    final boolean hasMissingValue;
+    final int size;
+    /** minimum value in the set, or Long.MAX_VALUE for an empty set */
+    public final long minValue;
+    /** maximum value in the set, or Long.MIN_VALUE for an empty set */
+    public final long maxValue;
+
+    /** Construct a set. Values must be in sorted order. */
+    public LongHashSet(long[] values) {
+        int tableSize = Math.toIntExact(values.length * 3L / 2);
+        tableSize = 1 << PackedInts.bitsRequired(tableSize); // make it a power of 2
+        assert tableSize >= values.length * 3L / 2;
+        table = new long[tableSize];
+        Arrays.fill(table, MISSING);
+        mask = tableSize - 1;
+        boolean hasMissingValue = false;
+        int size = 0;
+        long previousValue = Long.MIN_VALUE; // for assert
+        for (long value : values) {
+            if (value == MISSING) {
+                size += hasMissingValue ? 0 : 1;
+                hasMissingValue = true;
+            } else if (add(value)) {
+                ++size;
+            }
+            assert value >= previousValue : "values must be provided in sorted order";
+            previousValue = value;
+        }
+        this.hasMissingValue = hasMissingValue;
+        this.size = size;
+        this.minValue = values.length == 0 ? Long.MAX_VALUE : values[0];
+        this.maxValue = values.length == 0 ? Long.MIN_VALUE : values[values.length - 1];
+    }
+
+    private boolean add(long l) {
+        assert l != MISSING;
+        final int slot = Long.hashCode(l) & mask;
+        for (int i = slot;; i = (i + 1) & mask) {
+            if (table[i] == MISSING) {
+                table[i] = l;
+                return true;
+            } else if (table[i] == l) {
+                // already added
+                return false;
+            }
+        }
+    }
+
+    /**
+     * check for membership in the set.
+     *
+     * <p>You should use {@link #minValue} and {@link #maxValue} to guide/terminate iteration before
+     * calling this.
+     */
+    public boolean contains(long l) {
+        if (l == MISSING) {
+            return hasMissingValue;
+        }
+        final int slot = Long.hashCode(l) & mask;
+        for (int i = slot;; i = (i + 1) & mask) {
+            if (table[i] == MISSING) {
+                return false;
+            } else if (table[i] == l) {
+                return true;
+            }
+        }
+    }
+
+    /** returns a stream of all values contained in this set */
+    LongStream stream() {
+        LongStream stream = Arrays.stream(table).filter(v -> v != MISSING);
+        if (hasMissingValue) {
+            stream = LongStream.concat(LongStream.of(MISSING), stream);
+        }
+        return stream;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(size, minValue, maxValue, mask, hasMissingValue, Arrays.hashCode(table));
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj != null && obj instanceof LongHashSet) {
+            LongHashSet that = (LongHashSet) obj;
+            return size == that.size
+                && minValue == that.minValue
+                && maxValue == that.maxValue
+                && mask == that.mask
+                && hasMissingValue == that.hasMissingValue
+                && Arrays.equals(table, that.table);
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return stream().mapToObj(String::valueOf).collect(Collectors.joining(", ", "[", "]"));
+    }
+
+    /** number of elements in the set */
+    public int size() {
+        return size;
+    }
+
+    @Override
+    public long ramBytesUsed() {
+        return BASE_RAM_BYTES + RamUsageEstimator.sizeOfObject(table);
+    }
+}
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java
index bc27c70282368..6ce62dda32d0a 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java
@@ -220,9 +220,11 @@ private static ObjectParser<AliasActions, Void> parser(String name, Supplier<Ali
             ADD_PARSER.declareField(AliasActions::searchRouting, XContentParser::text, SEARCH_ROUTING, ValueType.INT);
             ADD_PARSER.declareField(AliasActions::writeIndex, XContentParser::booleanValue, IS_WRITE_INDEX, ValueType.BOOLEAN);
             ADD_PARSER.declareField(AliasActions::isHidden, XContentParser::booleanValue, IS_HIDDEN, ValueType.BOOLEAN);
-            ADD_PARSER.declareField(AliasActions::mustExist, XContentParser::booleanValue, MUST_EXIST, ValueType.BOOLEAN);
         }
         private static final ObjectParser<AliasActions, Void> REMOVE_PARSER = parser(REMOVE.getPreferredName(), AliasActions::remove);
+        static {
+            REMOVE_PARSER.declareField(AliasActions::mustExist, XContentParser::booleanValue, MUST_EXIST, ValueType.BOOLEAN);
+        }
         private static final ObjectParser<AliasActions, Void> REMOVE_INDEX_PARSER = parser(
             REMOVE_INDEX.getPreferredName(),
             AliasActions::removeIndex
@@ -554,6 +556,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             if (null != isHidden) {
                 builder.field(IS_HIDDEN.getPreferredName(), isHidden);
             }
+            if (null != mustExist) {
+                builder.field(MUST_EXIST.getPreferredName(), mustExist);
+            }
             builder.endObject();
             builder.endObject();
             return builder;
@@ -582,6 +587,8 @@ public String toString() {
                 + searchRouting
                 + ",writeIndex="
                 + writeIndex
+                + ",mustExist="
+                + mustExist
                 + "]";
         }
 
@@ -600,12 +607,13 @@ public boolean equals(Object obj) {
                 && Objects.equals(indexRouting, other.indexRouting)
                 && Objects.equals(searchRouting, other.searchRouting)
                 && Objects.equals(writeIndex, other.writeIndex)
-                && Objects.equals(isHidden, other.isHidden);
+                && Objects.equals(isHidden, other.isHidden)
+                && Objects.equals(mustExist, other.mustExist);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(type, indices, aliases, filter, routing, indexRouting, searchRouting, writeIndex, isHidden);
+            return Objects.hash(type, indices, aliases, filter, routing, indexRouting, searchRouting, writeIndex, isHidden, mustExist);
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
index 769044f3dafb7..81cb3102cfcb9 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
@@ -50,6 +50,7 @@
 import org.opensearch.cluster.metadata.MetadataIndexAliasesService;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.common.regex.Regex;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.index.Index;
@@ -59,6 +60,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -220,12 +222,33 @@ private static String[] concreteAliases(IndicesAliasesRequest.AliasActions actio
             // for DELETE we expand the aliases
             String[] indexAsArray = { concreteIndex };
             final Map<String, List<AliasMetadata>> aliasMetadata = metadata.findAliases(action, indexAsArray);
-            List<String> finalAliases = new ArrayList<>();
+            Set<String> finalAliases = new HashSet<>();
             for (final List<AliasMetadata> curAliases : aliasMetadata.values()) {
                 for (AliasMetadata aliasMeta : curAliases) {
                     finalAliases.add(aliasMeta.alias());
                 }
             }
+
+            // must_exist can only be set in the Remove Action in Update aliases API,
+            // we check the value here to make the behavior consistent with Delete aliases API
+            if (action.mustExist() != null) {
+                // if must_exist is false, we should make the remove action execute silently,
+                // so we return the original specified aliases to avoid AliasesNotFoundException
+                if (!action.mustExist()) {
+                    return action.aliases();
+                }
+
+                // if there is any non-existing aliases specified in the request and must_exist is true, throw exception in advance
+                if (finalAliases.isEmpty()) {
+                    throw new AliasesNotFoundException(action.aliases());
+                }
+                String[] nonExistingAliases = Arrays.stream(action.aliases())
+                    .filter(originalAlias -> finalAliases.stream().noneMatch(finalAlias -> Regex.simpleMatch(originalAlias, finalAlias)))
+                    .toArray(String[]::new);
+                if (nonExistingAliases.length != 0) {
+                    throw new AliasesNotFoundException(nonExistingAliases);
+                }
+            }
             return finalAliases.toArray(new String[0]);
         } else {
             // for ADD and REMOVE_INDEX we just return the current aliases
diff --git a/server/src/main/java/org/opensearch/action/search/SearchQueryAggregationCategorizer.java b/server/src/main/java/org/opensearch/action/search/SearchQueryAggregationCategorizer.java
new file mode 100644
index 0000000000000..607ccf182851b
--- /dev/null
+++ b/server/src/main/java/org/opensearch/action/search/SearchQueryAggregationCategorizer.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.action.search;
+
+import org.opensearch.search.aggregations.AggregationBuilder;
+import org.opensearch.search.aggregations.PipelineAggregationBuilder;
+import org.opensearch.telemetry.metrics.tags.Tags;
+
+import java.util.Collection;
+
+/**
+ * Increments the counters related to Aggregation Search Queries.
+ */
+public class SearchQueryAggregationCategorizer {
+
+    private static final String TYPE_TAG = "type";
+    private final SearchQueryCounters searchQueryCounters;
+
+    public SearchQueryAggregationCategorizer(SearchQueryCounters searchQueryCounters) {
+        this.searchQueryCounters = searchQueryCounters;
+    }
+
+    public void incrementSearchQueryAggregationCounters(Collection<AggregationBuilder> aggregatorFactories) {
+        for (AggregationBuilder aggregationBuilder : aggregatorFactories) {
+            incrementCountersRecursively(aggregationBuilder);
+        }
+    }
+
+    private void incrementCountersRecursively(AggregationBuilder aggregationBuilder) {
+        // Increment counters for the current aggregation
+        String aggregationType = aggregationBuilder.getType();
+        searchQueryCounters.aggCounter.add(1, Tags.create().addTag(TYPE_TAG, aggregationType));
+
+        // Recursively process sub-aggregations if any
+        Collection<AggregationBuilder> subAggregations = aggregationBuilder.getSubAggregations();
+        if (subAggregations != null && !subAggregations.isEmpty()) {
+            for (AggregationBuilder subAggregation : subAggregations) {
+                incrementCountersRecursively(subAggregation);
+            }
+        }
+
+        // Process pipeline aggregations
+        Collection<PipelineAggregationBuilder> pipelineAggregations = aggregationBuilder.getPipelineAggregations();
+        for (PipelineAggregationBuilder pipelineAggregation : pipelineAggregations) {
+            String pipelineAggregationType = pipelineAggregation.getType();
+            searchQueryCounters.aggCounter.add(1, Tags.create().addTag(TYPE_TAG, pipelineAggregationType));
+        }
+    }
+}
diff --git a/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizer.java b/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizer.java
index 8fe1be610f9af..ffaae5b08772f 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizer.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizer.java
@@ -32,13 +32,15 @@ final class SearchQueryCategorizer {
 
     final SearchQueryCounters searchQueryCounters;
 
+    final SearchQueryAggregationCategorizer searchQueryAggregationCategorizer;
+
     public SearchQueryCategorizer(MetricsRegistry metricsRegistry) {
         searchQueryCounters = new SearchQueryCounters(metricsRegistry);
+        searchQueryAggregationCategorizer = new SearchQueryAggregationCategorizer(searchQueryCounters);
     }
 
     public void categorize(SearchSourceBuilder source) {
         QueryBuilder topLevelQueryBuilder = source.query();
-
         logQueryShape(topLevelQueryBuilder);
         incrementQueryTypeCounters(topLevelQueryBuilder);
         incrementQueryAggregationCounters(source.aggregations());
@@ -56,9 +58,11 @@ private void incrementQuerySortCounters(List<SortBuilder<?>> sorts) {
     }
 
     private void incrementQueryAggregationCounters(AggregatorFactories.Builder aggregations) {
-        if (aggregations != null) {
-            searchQueryCounters.aggCounter.add(1);
+        if (aggregations == null) {
+            return;
         }
+
+        searchQueryAggregationCategorizer.incrementSearchQueryAggregationCounters(aggregations.getAggregatorFactories());
     }
 
     private void incrementQueryTypeCounters(QueryBuilder topLevelQueryBuilder) {
diff --git a/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizingVisitor.java b/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizingVisitor.java
index 98f0169e69a5c..31f83dbef9dc9 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizingVisitor.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizingVisitor.java
@@ -9,26 +9,14 @@
 package org.opensearch.action.search;
 
 import org.apache.lucene.search.BooleanClause;
-import org.opensearch.index.query.BoolQueryBuilder;
-import org.opensearch.index.query.MatchPhraseQueryBuilder;
-import org.opensearch.index.query.MatchQueryBuilder;
-import org.opensearch.index.query.MultiMatchQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilderVisitor;
-import org.opensearch.index.query.QueryStringQueryBuilder;
-import org.opensearch.index.query.RangeQueryBuilder;
-import org.opensearch.index.query.RegexpQueryBuilder;
-import org.opensearch.index.query.TermQueryBuilder;
-import org.opensearch.index.query.WildcardQueryBuilder;
-import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.opensearch.telemetry.metrics.tags.Tags;
 
 /**
- * Class to visit the querybuilder tree and also track the level information.
+ * Class to visit the query builder tree and also track the level information.
  * Increments the counters related to Search Query type.
  */
 final class SearchQueryCategorizingVisitor implements QueryBuilderVisitor {
-    private static final String LEVEL_TAG = "level";
     private final int level;
     private final SearchQueryCounters searchQueryCounters;
 
@@ -42,29 +30,7 @@ private SearchQueryCategorizingVisitor(SearchQueryCounters counters, int level)
     }
 
     public void accept(QueryBuilder qb) {
-        if (qb instanceof BoolQueryBuilder) {
-            searchQueryCounters.boolCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof FunctionScoreQueryBuilder) {
-            searchQueryCounters.functionScoreCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof MatchQueryBuilder) {
-            searchQueryCounters.matchCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof MatchPhraseQueryBuilder) {
-            searchQueryCounters.matchPhrasePrefixCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof MultiMatchQueryBuilder) {
-            searchQueryCounters.multiMatchCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof QueryStringQueryBuilder) {
-            searchQueryCounters.queryStringQueryCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof RangeQueryBuilder) {
-            searchQueryCounters.rangeCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof RegexpQueryBuilder) {
-            searchQueryCounters.regexCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof TermQueryBuilder) {
-            searchQueryCounters.termCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else if (qb instanceof WildcardQueryBuilder) {
-            searchQueryCounters.wildcardCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        } else {
-            searchQueryCounters.otherQueryCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
-        }
+        searchQueryCounters.incrementCounter(qb, level);
     }
 
     public QueryBuilderVisitor getChildVisitor(BooleanClause.Occur occur) {
diff --git a/server/src/main/java/org/opensearch/action/search/SearchQueryCounters.java b/server/src/main/java/org/opensearch/action/search/SearchQueryCounters.java
index 7e0259af07701..bbb883809b41b 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchQueryCounters.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchQueryCounters.java
@@ -8,33 +8,82 @@
 
 package org.opensearch.action.search;
 
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.BoostingQueryBuilder;
+import org.opensearch.index.query.ConstantScoreQueryBuilder;
+import org.opensearch.index.query.DisMaxQueryBuilder;
+import org.opensearch.index.query.DistanceFeatureQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.FieldMaskingSpanQueryBuilder;
+import org.opensearch.index.query.FuzzyQueryBuilder;
+import org.opensearch.index.query.GeoBoundingBoxQueryBuilder;
+import org.opensearch.index.query.GeoDistanceQueryBuilder;
+import org.opensearch.index.query.GeoPolygonQueryBuilder;
+import org.opensearch.index.query.GeoShapeQueryBuilder;
+import org.opensearch.index.query.IntervalQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.MultiMatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryStringQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.ScriptQueryBuilder;
+import org.opensearch.index.query.SimpleQueryStringBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.opensearch.telemetry.metrics.Counter;
 import org.opensearch.telemetry.metrics.MetricsRegistry;
+import org.opensearch.telemetry.metrics.tags.Tags;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Class contains all the Counters related to search query types.
  */
 final class SearchQueryCounters {
+    private static final String LEVEL_TAG = "level";
     private static final String UNIT = "1";
     private final MetricsRegistry metricsRegistry;
 
     // Counters related to Query types
     public final Counter aggCounter;
     public final Counter boolCounter;
+    public final Counter boostingCounter;
+    public final Counter constantScoreCounter;
+    public final Counter disMaxCounter;
+    public final Counter distanceFeatureCounter;
+    public final Counter existsCounter;
+    public final Counter fieldMaskingSpanCounter;
     public final Counter functionScoreCounter;
+    public final Counter fuzzyCounter;
+    public final Counter geoBoundingBoxCounter;
+    public final Counter geoDistanceCounter;
+    public final Counter geoPolygonCounter;
+    public final Counter geoShapeCounter;
+    public final Counter intervalCounter;
     public final Counter matchCounter;
+    public final Counter matchallCounter;
     public final Counter matchPhrasePrefixCounter;
     public final Counter multiMatchCounter;
     public final Counter otherQueryCounter;
-    public final Counter queryStringQueryCounter;
+    public final Counter prefixCounter;
+    public final Counter queryStringCounter;
     public final Counter rangeCounter;
-    public final Counter regexCounter;
-
+    public final Counter regexpCounter;
+    public final Counter scriptCounter;
+    public final Counter simpleQueryStringCounter;
     public final Counter sortCounter;
     public final Counter skippedCounter;
     public final Counter termCounter;
     public final Counter totalCounter;
     public final Counter wildcardCounter;
+    public final Counter numberOfInputFieldsCounter;
+    private final Map<Class<? extends QueryBuilder>, Counter> queryHandlers;
 
     public SearchQueryCounters(MetricsRegistry metricsRegistry) {
         this.metricsRegistry = metricsRegistry;
@@ -48,16 +97,81 @@ public SearchQueryCounters(MetricsRegistry metricsRegistry) {
             "Counter for the number of top level and nested bool search queries",
             UNIT
         );
+        this.boostingCounter = metricsRegistry.createCounter(
+            "search.query.type.boost.count",
+            "Counter for the number of top level and nested boost search queries",
+            UNIT
+        );
+        this.constantScoreCounter = metricsRegistry.createCounter(
+            "search.query.type.counstantscore.count",
+            "Counter for the number of top level and nested constant score search queries",
+            UNIT
+        );
+        this.disMaxCounter = metricsRegistry.createCounter(
+            "search.query.type.dismax.count",
+            "Counter for the number of top level and nested disjuntion max search queries",
+            UNIT
+        );
+        this.distanceFeatureCounter = metricsRegistry.createCounter(
+            "search.query.type.distancefeature.count",
+            "Counter for the number of top level and nested distance feature search queries",
+            UNIT
+        );
+        this.existsCounter = metricsRegistry.createCounter(
+            "search.query.type.exists.count",
+            "Counter for the number of top level and nested exists search queries",
+            UNIT
+        );
+        this.fieldMaskingSpanCounter = metricsRegistry.createCounter(
+            "search.query.type.fieldmaskingspan.count",
+            "Counter for the number of top level and nested field masking span search queries",
+            UNIT
+        );
         this.functionScoreCounter = metricsRegistry.createCounter(
             "search.query.type.functionscore.count",
             "Counter for the number of top level and nested function score search queries",
             UNIT
         );
+        this.fuzzyCounter = metricsRegistry.createCounter(
+            "search.query.type.fuzzy.count",
+            "Counter for the number of top level and nested fuzzy search queries",
+            UNIT
+        );
+        this.geoBoundingBoxCounter = metricsRegistry.createCounter(
+            "search.query.type.geoboundingbox.count",
+            "Counter for the number of top level and nested geo bounding box queries",
+            UNIT
+        );
+        this.geoDistanceCounter = metricsRegistry.createCounter(
+            "search.query.type.geodistance.count",
+            "Counter for the number of top level and nested geo distance queries",
+            UNIT
+        );
+        this.geoPolygonCounter = metricsRegistry.createCounter(
+            "search.query.type.geopolygon.count",
+            "Counter for the number of top level and nested geo polygon queries",
+            UNIT
+        );
+        this.geoShapeCounter = metricsRegistry.createCounter(
+            "search.query.type.geoshape.count",
+            "Counter for the number of top level and nested geo shape queries",
+            UNIT
+        );
+        this.intervalCounter = metricsRegistry.createCounter(
+            "search.query.type.interval.count",
+            "Counter for the number of top level and nested interval queries",
+            UNIT
+        );
         this.matchCounter = metricsRegistry.createCounter(
             "search.query.type.match.count",
             "Counter for the number of top level and nested match search queries",
             UNIT
         );
+        this.matchallCounter = metricsRegistry.createCounter(
+            "search.query.type.matchall.count",
+            "Counter for the number of top level and nested match all search queries",
+            UNIT
+        );
         this.matchPhrasePrefixCounter = metricsRegistry.createCounter(
             "search.query.type.matchphrase.count",
             "Counter for the number of top level and nested match phrase prefix search queries",
@@ -73,7 +187,12 @@ public SearchQueryCounters(MetricsRegistry metricsRegistry) {
             "Counter for the number of top level and nested search queries that do not match any other categories",
             UNIT
         );
-        this.queryStringQueryCounter = metricsRegistry.createCounter(
+        this.prefixCounter = metricsRegistry.createCounter(
+            "search.query.type.prefix.count",
+            "Counter for the number of top level and nested search queries that match prefix queries",
+            UNIT
+        );
+        this.queryStringCounter = metricsRegistry.createCounter(
             "search.query.type.querystringquery.count",
             "Counter for the number of top level and nested queryStringQuery search queries",
             UNIT
@@ -83,11 +202,21 @@ public SearchQueryCounters(MetricsRegistry metricsRegistry) {
             "Counter for the number of top level and nested range search queries",
             UNIT
         );
-        this.regexCounter = metricsRegistry.createCounter(
+        this.regexpCounter = metricsRegistry.createCounter(
             "search.query.type.regex.count",
             "Counter for the number of top level and nested regex search queries",
             UNIT
         );
+        this.scriptCounter = metricsRegistry.createCounter(
+            "search.query.type.script.count",
+            "Counter for the number of top level and nested script search queries",
+            UNIT
+        );
+        this.simpleQueryStringCounter = metricsRegistry.createCounter(
+            "search.query.type.simplequerystring.count",
+            "Counter for the number of top level and nested script simple query string search queries",
+            UNIT
+        );
         this.skippedCounter = metricsRegistry.createCounter(
             "search.query.type.skipped.count",
             "Counter for the number queries skipped due to error",
@@ -113,5 +242,51 @@ public SearchQueryCounters(MetricsRegistry metricsRegistry) {
             "Counter for the number of top level and nested wildcard search queries",
             UNIT
         );
+        this.numberOfInputFieldsCounter = metricsRegistry.createCounter(
+            "search.query.type.numberofinputfields.count",
+            "Counter for the number of input fields in the search queries",
+            UNIT
+        );
+        this.queryHandlers = new HashMap<>();
+        initializeQueryHandlers();
+    }
+
+    public void incrementCounter(QueryBuilder queryBuilder, int level) {
+        Counter counter = queryHandlers.get(queryBuilder.getClass());
+        if (counter != null) {
+            counter.add(1, Tags.create().addTag(LEVEL_TAG, level));
+        } else {
+            otherQueryCounter.add(1, Tags.create().addTag(LEVEL_TAG, level));
+        }
+    }
+
+    private void initializeQueryHandlers() {
+
+        queryHandlers.put(BoolQueryBuilder.class, boolCounter);
+        queryHandlers.put(FunctionScoreQueryBuilder.class, functionScoreCounter);
+        queryHandlers.put(MatchQueryBuilder.class, matchCounter);
+        queryHandlers.put(MatchPhraseQueryBuilder.class, matchPhrasePrefixCounter);
+        queryHandlers.put(MultiMatchQueryBuilder.class, multiMatchCounter);
+        queryHandlers.put(QueryStringQueryBuilder.class, queryStringCounter);
+        queryHandlers.put(RangeQueryBuilder.class, rangeCounter);
+        queryHandlers.put(RegexpQueryBuilder.class, regexpCounter);
+        queryHandlers.put(TermQueryBuilder.class, termCounter);
+        queryHandlers.put(WildcardQueryBuilder.class, wildcardCounter);
+        queryHandlers.put(BoostingQueryBuilder.class, boostingCounter);
+        queryHandlers.put(ConstantScoreQueryBuilder.class, constantScoreCounter);
+        queryHandlers.put(DisMaxQueryBuilder.class, disMaxCounter);
+        queryHandlers.put(DistanceFeatureQueryBuilder.class, distanceFeatureCounter);
+        queryHandlers.put(ExistsQueryBuilder.class, existsCounter);
+        queryHandlers.put(FieldMaskingSpanQueryBuilder.class, fieldMaskingSpanCounter);
+        queryHandlers.put(FuzzyQueryBuilder.class, fuzzyCounter);
+        queryHandlers.put(GeoBoundingBoxQueryBuilder.class, geoBoundingBoxCounter);
+        queryHandlers.put(GeoDistanceQueryBuilder.class, geoDistanceCounter);
+        queryHandlers.put(GeoPolygonQueryBuilder.class, geoPolygonCounter);
+        queryHandlers.put(GeoShapeQueryBuilder.class, geoShapeCounter);
+        queryHandlers.put(IntervalQueryBuilder.class, intervalCounter);
+        queryHandlers.put(MatchAllQueryBuilder.class, matchallCounter);
+        queryHandlers.put(PrefixQueryBuilder.class, prefixCounter);
+        queryHandlers.put(ScriptQueryBuilder.class, scriptCounter);
+        queryHandlers.put(SimpleQueryStringBuilder.class, simpleQueryStringCounter);
     }
 }
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java b/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java
index 47c6cad04343e..dac6ecaa13781 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java
@@ -35,6 +35,7 @@
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.common.Nullable;
 import org.opensearch.core.common.Strings;
+import org.opensearch.rest.action.admin.indices.AliasesNotFoundException;
 
 /**
  * Individual operation to perform on the cluster state as part of an {@link IndicesAliasesRequest}.
@@ -225,8 +226,8 @@ boolean removeIndex() {
         @Override
         boolean apply(NewAliasValidator aliasValidator, Metadata.Builder metadata, IndexMetadata index) {
             if (false == index.getAliases().containsKey(alias)) {
-                if (mustExist != null && mustExist.booleanValue()) {
-                    throw new IllegalArgumentException("required alias [" + alias + "] does not exist");
+                if (mustExist != null && mustExist) {
+                    throw new AliasesNotFoundException(alias);
                 }
                 return false;
             }
diff --git a/server/src/main/java/org/opensearch/common/settings/FeatureFlagSettings.java b/server/src/main/java/org/opensearch/common/settings/FeatureFlagSettings.java
index 387b0c9753574..d3285c379bcc4 100644
--- a/server/src/main/java/org/opensearch/common/settings/FeatureFlagSettings.java
+++ b/server/src/main/java/org/opensearch/common/settings/FeatureFlagSettings.java
@@ -40,7 +40,8 @@ protected FeatureFlagSettings(
                 FeatureFlags.IDENTITY_SETTING,
                 FeatureFlags.CONCURRENT_SEGMENT_SEARCH_SETTING,
                 FeatureFlags.TELEMETRY_SETTING,
-                FeatureFlags.DATETIME_FORMATTER_CACHING_SETTING
+                FeatureFlags.DATETIME_FORMATTER_CACHING_SETTING,
+                FeatureFlags.WRITEABLE_REMOTE_INDEX_SETTING
             )
         )
     );
diff --git a/server/src/main/java/org/opensearch/common/util/FeatureFlags.java b/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
index 4e9b417e3433b..c54772caa574b 100644
--- a/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
+++ b/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
@@ -60,6 +60,12 @@ public class FeatureFlags {
      */
     public static final String DATETIME_FORMATTER_CACHING = "opensearch.experimental.optimization.datetime_formatter_caching.enabled";
 
+    /**
+     * Gates the functionality of writeable remote index
+     * Once the feature is ready for release, this feature flag can be removed.
+     */
+    public static final String WRITEABLE_REMOTE_INDEX = "opensearch.experimental.feature.writeable_remote_index.enabled";
+
     /**
      * Should store the settings from opensearch.yml.
      */
@@ -122,4 +128,10 @@ public static boolean isEnabled(Setting<Boolean> featureFlag) {
         true,
         Property.NodeScope
     );
+
+    public static final Setting<Boolean> WRITEABLE_REMOTE_INDEX_SETTING = Setting.boolSetting(
+        WRITEABLE_REMOTE_INDEX,
+        false,
+        Property.NodeScope
+    );
 }
diff --git a/server/src/main/java/org/opensearch/common/xcontent/JsonToStringXContentParser.java b/server/src/main/java/org/opensearch/common/xcontent/JsonToStringXContentParser.java
index 9e81d8a7af078..9b2bd06a88e2e 100644
--- a/server/src/main/java/org/opensearch/common/xcontent/JsonToStringXContentParser.java
+++ b/server/src/main/java/org/opensearch/common/xcontent/JsonToStringXContentParser.java
@@ -18,7 +18,6 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentLocation;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.index.mapper.ParseContext;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -40,7 +39,6 @@ public class JsonToStringXContentParser extends AbstractXContentParser {
     private ArrayList<String> keyList = new ArrayList<>();
 
     private XContentBuilder builder = XContentBuilder.builder(JsonXContent.jsonXContent);
-    private ParseContext parseContext;
 
     private NamedXContentRegistry xContentRegistry;
 
@@ -54,14 +52,13 @@ public class JsonToStringXContentParser extends AbstractXContentParser {
     public JsonToStringXContentParser(
         NamedXContentRegistry xContentRegistry,
         DeprecationHandler deprecationHandler,
-        ParseContext parseContext,
+        XContentParser parser,
         String fieldTypeName
     ) throws IOException {
         super(xContentRegistry, deprecationHandler);
-        this.parseContext = parseContext;
         this.deprecationHandler = deprecationHandler;
         this.xContentRegistry = xContentRegistry;
-        this.parser = parseContext.parser();
+        this.parser = parser;
         this.fieldTypeName = fieldTypeName;
     }
 
@@ -86,8 +83,22 @@ private void parseToken(StringBuilder path, String currentFieldName) throws IOEx
             StringBuilder parsedFields = new StringBuilder();
 
             if (this.parser.currentToken() == Token.FIELD_NAME) {
-                path.append(DOT_SYMBOL + currentFieldName);
-                this.keyList.add(currentFieldName);
+                path.append(DOT_SYMBOL).append(currentFieldName);
+                int dotIndex = currentFieldName.indexOf(DOT_SYMBOL);
+                String fieldNameSuffix = currentFieldName;
+                // The field name may be of the form foo.bar.baz
+                // If that's the case, each "part" is a key.
+                while (dotIndex >= 0) {
+                    String fieldNamePrefix = fieldNameSuffix.substring(0, dotIndex);
+                    if (!fieldNamePrefix.isEmpty()) {
+                        this.keyList.add(fieldNamePrefix);
+                    }
+                    fieldNameSuffix = fieldNameSuffix.substring(dotIndex + 1);
+                    dotIndex = fieldNameSuffix.indexOf(DOT_SYMBOL);
+                }
+                if (!fieldNameSuffix.isEmpty()) {
+                    this.keyList.add(fieldNameSuffix);
+                }
             } else if (this.parser.currentToken() == Token.START_ARRAY) {
                 parseToken(path, currentFieldName);
                 break;
@@ -97,18 +108,18 @@ private void parseToken(StringBuilder path, String currentFieldName) throws IOEx
                 parseToken(path, currentFieldName);
                 int dotIndex = path.lastIndexOf(DOT_SYMBOL);
                 if (dotIndex != -1) {
-                    path.delete(dotIndex, path.length());
+                    path.setLength(path.length() - currentFieldName.length() - 1);
                 }
             } else {
                 if (!path.toString().contains(currentFieldName)) {
-                    path.append(DOT_SYMBOL + currentFieldName);
+                    path.append(DOT_SYMBOL).append(currentFieldName);
                 }
                 parseValue(parsedFields);
                 this.valueList.add(parsedFields.toString());
                 this.valueAndPathList.add(path + EQUAL_SYMBOL + parsedFields);
                 int dotIndex = path.lastIndexOf(DOT_SYMBOL);
                 if (dotIndex != -1) {
-                    path.delete(dotIndex, path.length());
+                    path.setLength(path.length() - currentFieldName.length() - 1);
                 }
             }
 
diff --git a/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesSetQuery.java b/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesSetQuery.java
new file mode 100644
index 0000000000000..669dbb1e1bfc7
--- /dev/null
+++ b/server/src/main/java/org/opensearch/index/document/SortedUnsignedLongDocValuesSetQuery.java
@@ -0,0 +1,176 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.index.document;
+
+import org.apache.lucene.index.DocValues;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.NumericDocValues;
+import org.apache.lucene.index.SortedNumericDocValues;
+import org.apache.lucene.search.ConstantScoreScorer;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
+import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.TwoPhaseIterator;
+import org.apache.lucene.search.Weight;
+import org.apache.lucene.util.LongHashSet;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * The {@link org.apache.lucene.document.SortedNumericDocValuesSetQuery} implementation for unsigned long numeric data type.
+ *
+ * @opensearch.internal
+ */
+public abstract class SortedUnsignedLongDocValuesSetQuery extends Query {
+
+    private final String field;
+    private final LongHashSet numbers;
+
+    SortedUnsignedLongDocValuesSetQuery(String field, BigInteger[] numbers) {
+        this.field = Objects.requireNonNull(field);
+        Arrays.sort(numbers);
+        this.numbers = new LongHashSet(Arrays.stream(numbers).mapToLong(n -> n.longValue()).toArray());
+    }
+
+    @Override
+    public String toString(String field) {
+        return new StringBuilder().append(field).append(": ").append(numbers.toString()).toString();
+    }
+
+    @Override
+    public void visit(QueryVisitor visitor) {
+        if (visitor.acceptField(field)) {
+            visitor.visitLeaf(this);
+        }
+    }
+
+    @Override
+    public Query rewrite(IndexSearcher indexSearcher) throws IOException {
+        if (numbers.size() == 0) {
+            return new MatchNoDocsQuery();
+        }
+        return super.rewrite(indexSearcher);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (sameClassAs(other) == false) {
+            return false;
+        }
+        SortedUnsignedLongDocValuesSetQuery that = (SortedUnsignedLongDocValuesSetQuery) other;
+        return field.equals(that.field) && numbers.equals(that.numbers);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(classHash(), field, numbers);
+    }
+
+    abstract SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException;
+
+    @Override
+    public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost) throws IOException {
+        return new ConstantScoreWeight(this, boost) {
+
+            @Override
+            public boolean isCacheable(LeafReaderContext ctx) {
+                return DocValues.isCacheable(ctx, field);
+            }
+
+            @Override
+            public Scorer scorer(LeafReaderContext context) throws IOException {
+                SortedNumericDocValues values = getValues(context.reader(), field);
+                if (values == null) {
+                    return null;
+                }
+                final NumericDocValues singleton = DocValues.unwrapSingleton(values);
+                final TwoPhaseIterator iterator;
+                if (singleton != null) {
+                    iterator = new TwoPhaseIterator(singleton) {
+                        @Override
+                        public boolean matches() throws IOException {
+                            long value = singleton.longValue();
+                            return Long.compareUnsigned(value, numbers.minValue) >= 0
+                                && Long.compareUnsigned(value, numbers.maxValue) <= 0
+                                && numbers.contains(value);
+                        }
+
+                        @Override
+                        public float matchCost() {
+                            return 5; // 2 comparisions, possible lookup in the set
+                        }
+                    };
+                } else {
+                    iterator = new TwoPhaseIterator(values) {
+                        @Override
+                        public boolean matches() throws IOException {
+                            int count = values.docValueCount();
+                            for (int i = 0; i < count; i++) {
+                                final long value = values.nextValue();
+                                if (Long.compareUnsigned(value, numbers.minValue) < 0) {
+                                    continue;
+                                } else if (Long.compareUnsigned(value, numbers.maxValue) > 0) {
+                                    return false; // values are sorted, terminate
+                                } else if (numbers.contains(value)) {
+                                    return true;
+                                }
+                            }
+                            return false;
+                        }
+
+                        @Override
+                        public float matchCost() {
+                            return 5; // 2 comparisons, possible lookup in the set
+                        }
+                    };
+                }
+                return new ConstantScoreScorer(this, score(), scoreMode, iterator);
+            }
+        };
+    }
+
+    public static Query newSlowSetQuery(String field, BigInteger... values) {
+        return new SortedUnsignedLongDocValuesSetQuery(field, values) {
+            @Override
+            SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException {
+                FieldInfo info = reader.getFieldInfos().fieldInfo(field);
+                if (info == null) {
+                    // Queries have some optimizations when one sub scorer returns null rather
+                    // than a scorer that does not match any documents
+                    return null;
+                }
+                return DocValues.getSortedNumeric(reader, field);
+            }
+        };
+    }
+
+    public static Query newSlowExactQuery(String field, BigInteger value) {
+        return new SortedUnsignedLongDocValuesRangeQuery(field, value, value) {
+            @Override
+            SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException {
+                FieldInfo info = reader.getFieldInfos().fieldInfo(field);
+                if (info == null) {
+                    // Queries have some optimizations when one sub scorer returns null rather
+                    // than a scorer that does not match any documents
+                    return null;
+                }
+                return DocValues.getSortedNumeric(reader, field);
+            }
+        };
+    }
+}
diff --git a/server/src/main/java/org/opensearch/index/mapper/FlatObjectFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/FlatObjectFieldMapper.java
index 00b623dddac23..9a3f2595a7c9e 100644
--- a/server/src/main/java/org/opensearch/index/mapper/FlatObjectFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/FlatObjectFieldMapper.java
@@ -572,7 +572,7 @@ protected void parseCreateField(ParseContext context) throws IOException {
             JsonToStringXContentParser JsonToStringParser = new JsonToStringXContentParser(
                 NamedXContentRegistry.EMPTY,
                 DeprecationHandler.IGNORE_DEPRECATIONS,
-                context,
+                context.parser(),
                 fieldType().name()
             );
             /*
diff --git a/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java
index 204e7bc4c16ab..524d2b0e0dd38 100644
--- a/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java
@@ -37,6 +37,7 @@
 
 import org.apache.lucene.document.DoublePoint;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FloatField;
 import org.apache.lucene.document.FloatPoint;
 import org.apache.lucene.document.IntPoint;
 import org.apache.lucene.document.LongPoint;
@@ -61,6 +62,7 @@
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.core.xcontent.XContentParser.Token;
 import org.opensearch.index.document.SortedUnsignedLongDocValuesRangeQuery;
+import org.opensearch.index.document.SortedUnsignedLongDocValuesSetQuery;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.IndexNumericFieldData.NumericType;
 import org.opensearch.index.fielddata.plain.SortedNumericIndexFieldData;
@@ -201,18 +203,39 @@ public Float parse(XContentParser parser, boolean coerce) throws IOException {
             }
 
             @Override
-            public Query termQuery(String field, Object value) {
+            public Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable) {
                 float v = parse(value, false);
+                if (isSearchable && hasDocValues) {
+                    Query query = HalfFloatPoint.newExactQuery(field, v);
+                    Query dvQuery = SortedNumericDocValuesField.newSlowExactQuery(field, HalfFloatPoint.halfFloatToSortableShort(v));
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowExactQuery(field, HalfFloatPoint.halfFloatToSortableShort(v));
+                }
                 return HalfFloatPoint.newExactQuery(field, v);
             }
 
             @Override
-            public Query termsQuery(String field, List<Object> values) {
+            public Query termsQuery(String field, List<Object> values, boolean hasDocValues, boolean isSearchable) {
                 float[] v = new float[values.size()];
+                long points[] = new long[v.length];
                 for (int i = 0; i < values.size(); ++i) {
                     v[i] = parse(values.get(i), false);
+                    if (hasDocValues) {
+                        points[i] = HalfFloatPoint.halfFloatToSortableShort(v[i]);
+                    }
+                }
+                if (isSearchable && hasDocValues) {
+                    Query query = HalfFloatPoint.newSetQuery(field, v);
+                    Query dvQuery = SortedNumericDocValuesField.newSlowSetQuery(field, points);
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowSetQuery(field, points);
                 }
                 return HalfFloatPoint.newSetQuery(field, v);
+
             }
 
             @Override
@@ -223,6 +246,7 @@ public Query rangeQuery(
                 boolean includeLower,
                 boolean includeUpper,
                 boolean hasDocValues,
+                boolean isSearchable,
                 QueryShardContext context
             ) {
                 float l = Float.NEGATIVE_INFINITY;
@@ -241,16 +265,23 @@ public Query rangeQuery(
                     }
                     u = HalfFloatPoint.nextDown(u);
                 }
-                Query query = HalfFloatPoint.newRangeQuery(field, l, u);
-                if (hasDocValues) {
+                if (isSearchable && hasDocValues) {
+                    Query query = HalfFloatPoint.newRangeQuery(field, l, u);
                     Query dvQuery = SortedNumericDocValuesField.newSlowRangeQuery(
                         field,
                         HalfFloatPoint.halfFloatToSortableShort(l),
                         HalfFloatPoint.halfFloatToSortableShort(u)
                     );
-                    query = new IndexOrDocValuesQuery(query, dvQuery);
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowRangeQuery(
+                        field,
+                        HalfFloatPoint.halfFloatToSortableShort(l),
+                        HalfFloatPoint.halfFloatToSortableShort(u)
+                    );
                 }
-                return query;
+                return HalfFloatPoint.newRangeQuery(field, l, u);
             }
 
             @Override
@@ -309,18 +340,39 @@ public Float parse(XContentParser parser, boolean coerce) throws IOException {
             }
 
             @Override
-            public Query termQuery(String field, Object value) {
+            public Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable) {
                 float v = parse(value, false);
+                if (isSearchable && hasDocValues) {
+                    Query query = FloatPoint.newExactQuery(field, v);
+                    Query dvQuery = SortedNumericDocValuesField.newSlowExactQuery(field, NumericUtils.floatToSortableInt(v));
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowExactQuery(field, NumericUtils.floatToSortableInt(v));
+                }
                 return FloatPoint.newExactQuery(field, v);
             }
 
             @Override
-            public Query termsQuery(String field, List<Object> values) {
+            public Query termsQuery(String field, List<Object> values, boolean hasDocValues, boolean isSearchable) {
                 float[] v = new float[values.size()];
+                long points[] = new long[v.length];
                 for (int i = 0; i < values.size(); ++i) {
                     v[i] = parse(values.get(i), false);
+                    if (hasDocValues) {
+                        points[i] = NumericUtils.floatToSortableInt(v[i]);
+                    }
+                }
+                if (isSearchable && hasDocValues) {
+                    return new IndexOrDocValuesQuery(
+                        FloatPoint.newSetQuery(field, v),
+                        SortedNumericDocValuesField.newSlowSetQuery(field, points)
+                    );
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowSetQuery(field, points);
                 }
-                return FloatPoint.newSetQuery(field, v);
+                return FloatField.newSetQuery(field, v);
             }
 
             @Override
@@ -331,6 +383,7 @@ public Query rangeQuery(
                 boolean includeLower,
                 boolean includeUpper,
                 boolean hasDocValues,
+                boolean isSearchable,
                 QueryShardContext context
             ) {
                 float l = Float.NEGATIVE_INFINITY;
@@ -347,16 +400,23 @@ public Query rangeQuery(
                         u = FloatPoint.nextDown(u);
                     }
                 }
-                Query query = FloatPoint.newRangeQuery(field, l, u);
-                if (hasDocValues) {
+                if (isSearchable && hasDocValues) {
+                    Query query = FloatPoint.newRangeQuery(field, l, u);
                     Query dvQuery = SortedNumericDocValuesField.newSlowRangeQuery(
                         field,
                         NumericUtils.floatToSortableInt(l),
                         NumericUtils.floatToSortableInt(u)
                     );
-                    query = new IndexOrDocValuesQuery(query, dvQuery);
+                    return new IndexOrDocValuesQuery(query, dvQuery);
                 }
-                return query;
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowRangeQuery(
+                        field,
+                        NumericUtils.floatToSortableInt(l),
+                        NumericUtils.floatToSortableInt(u)
+                    );
+                }
+                return FloatPoint.newRangeQuery(field, l, u);
             }
 
             @Override
@@ -406,16 +466,37 @@ public Double parse(XContentParser parser, boolean coerce) throws IOException {
             }
 
             @Override
-            public Query termQuery(String field, Object value) {
+            public Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable) {
                 double v = parse(value, false);
+                if (isSearchable && hasDocValues) {
+                    Query query = DoublePoint.newExactQuery(field, v);
+                    Query dvQuery = SortedNumericDocValuesField.newSlowExactQuery(field, NumericUtils.doubleToSortableLong(v));
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowExactQuery(field, NumericUtils.doubleToSortableLong(v));
+                }
                 return DoublePoint.newExactQuery(field, v);
             }
 
             @Override
-            public Query termsQuery(String field, List<Object> values) {
+            public Query termsQuery(String field, List<Object> values, boolean hasDocValues, boolean isSearchable) {
                 double[] v = new double[values.size()];
+                long points[] = new long[v.length];
                 for (int i = 0; i < values.size(); ++i) {
                     v[i] = parse(values.get(i), false);
+                    if (hasDocValues) {
+                        points[i] = NumericUtils.doubleToSortableLong(v[i]);
+                    }
+                }
+                if (isSearchable && hasDocValues) {
+                    return new IndexOrDocValuesQuery(
+                        DoublePoint.newSetQuery(field, v),
+                        SortedNumericDocValuesField.newSlowSetQuery(field, points)
+                    );
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowSetQuery(field, points);
                 }
                 return DoublePoint.newSetQuery(field, v);
             }
@@ -428,19 +509,27 @@ public Query rangeQuery(
                 boolean includeLower,
                 boolean includeUpper,
                 boolean hasDocValues,
+                boolean isSearchable,
                 QueryShardContext context
             ) {
                 return doubleRangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, (l, u) -> {
-                    Query query = DoublePoint.newRangeQuery(field, l, u);
-                    if (hasDocValues) {
+                    if (isSearchable && hasDocValues) {
+                        Query query = DoublePoint.newRangeQuery(field, l, u);
                         Query dvQuery = SortedNumericDocValuesField.newSlowRangeQuery(
                             field,
                             NumericUtils.doubleToSortableLong(l),
                             NumericUtils.doubleToSortableLong(u)
                         );
-                        query = new IndexOrDocValuesQuery(query, dvQuery);
+                        return new IndexOrDocValuesQuery(query, dvQuery);
                     }
-                    return query;
+                    if (hasDocValues) {
+                        return SortedNumericDocValuesField.newSlowRangeQuery(
+                            field,
+                            NumericUtils.doubleToSortableLong(l),
+                            NumericUtils.doubleToSortableLong(u)
+                        );
+                    }
+                    return DoublePoint.newRangeQuery(field, l, u);
                 });
             }
 
@@ -504,13 +593,13 @@ public Short parse(XContentParser parser, boolean coerce) throws IOException {
             }
 
             @Override
-            public Query termQuery(String field, Object value) {
-                return INTEGER.termQuery(field, value);
+            public Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable) {
+                return INTEGER.termQuery(field, value, hasDocValues, isSearchable);
             }
 
             @Override
-            public Query termsQuery(String field, List<Object> values) {
-                return INTEGER.termsQuery(field, values);
+            public Query termsQuery(String field, List<Object> values, boolean hasDocValues, boolean isSearchable) {
+                return INTEGER.termsQuery(field, values, hasDocValues, isSearchable);
             }
 
             @Override
@@ -521,9 +610,10 @@ public Query rangeQuery(
                 boolean includeLower,
                 boolean includeUpper,
                 boolean hasDocValues,
+                boolean isSearchable,
                 QueryShardContext context
             ) {
-                return INTEGER.rangeQuery(field, lowerTerm, upperTerm, includeLower, includeUpper, hasDocValues, context);
+                return INTEGER.rangeQuery(field, lowerTerm, upperTerm, includeLower, includeUpper, hasDocValues, isSearchable, context);
             }
 
             @Override
@@ -571,13 +661,13 @@ public Short parse(XContentParser parser, boolean coerce) throws IOException {
             }
 
             @Override
-            public Query termQuery(String field, Object value) {
-                return INTEGER.termQuery(field, value);
+            public Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable) {
+                return INTEGER.termQuery(field, value, hasDocValues, isSearchable);
             }
 
             @Override
-            public Query termsQuery(String field, List<Object> values) {
-                return INTEGER.termsQuery(field, values);
+            public Query termsQuery(String field, List<Object> values, boolean hasDocValues, boolean isSearchable) {
+                return INTEGER.termsQuery(field, values, hasDocValues, isSearchable);
             }
 
             @Override
@@ -588,9 +678,10 @@ public Query rangeQuery(
                 boolean includeLower,
                 boolean includeUpper,
                 boolean hasDocValues,
+                boolean isSearchable,
                 QueryShardContext context
             ) {
-                return INTEGER.rangeQuery(field, lowerTerm, upperTerm, includeLower, includeUpper, hasDocValues, context);
+                return INTEGER.rangeQuery(field, lowerTerm, upperTerm, includeLower, includeUpper, hasDocValues, isSearchable, context);
             }
 
             @Override
@@ -638,16 +729,24 @@ public Integer parse(XContentParser parser, boolean coerce) throws IOException {
             }
 
             @Override
-            public Query termQuery(String field, Object value) {
+            public Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable) {
                 if (hasDecimalPart(value)) {
                     return Queries.newMatchNoDocsQuery("Value [" + value + "] has a decimal part");
                 }
                 int v = parse(value, true);
+                if (isSearchable && hasDocValues) {
+                    Query query = IntPoint.newExactQuery(field, v);
+                    Query dvQuery = SortedNumericDocValuesField.newSlowExactQuery(field, v);
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowExactQuery(field, v);
+                }
                 return IntPoint.newExactQuery(field, v);
             }
 
             @Override
-            public Query termsQuery(String field, List<Object> values) {
+            public Query termsQuery(String field, List<Object> values, boolean hasDocValues, boolean isSearchable) {
                 int[] v = new int[values.size()];
                 int upTo = 0;
 
@@ -664,6 +763,21 @@ public Query termsQuery(String field, List<Object> values) {
                 if (upTo != v.length) {
                     v = Arrays.copyOf(v, upTo);
                 }
+                long points[] = new long[v.length];
+                if (hasDocValues) {
+                    for (int i = 0; i < v.length; i++) {
+                        points[i] = v[i];
+                    }
+                }
+                if (isSearchable && hasDocValues) {
+                    return new IndexOrDocValuesQuery(
+                        IntPoint.newSetQuery(field, v),
+                        SortedNumericDocValuesField.newSlowSetQuery(field, points)
+                    );
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowSetQuery(field, points);
+                }
                 return IntPoint.newSetQuery(field, v);
             }
 
@@ -675,6 +789,7 @@ public Query rangeQuery(
                 boolean includeLower,
                 boolean includeUpper,
                 boolean hasDocValues,
+                boolean isSearchable,
                 QueryShardContext context
             ) {
                 int l = Integer.MIN_VALUE;
@@ -704,15 +819,23 @@ public Query rangeQuery(
                         --u;
                     }
                 }
-                Query query = IntPoint.newRangeQuery(field, l, u);
-                if (hasDocValues) {
+                if (isSearchable && hasDocValues) {
+                    Query query = IntPoint.newRangeQuery(field, l, u);
                     Query dvQuery = SortedNumericDocValuesField.newSlowRangeQuery(field, l, u);
                     query = new IndexOrDocValuesQuery(query, dvQuery);
                     if (context.indexSortedOnField(field)) {
                         query = new IndexSortSortedNumericDocValuesRangeQuery(field, l, u, query);
                     }
+                    return query;
                 }
-                return query;
+                if (hasDocValues) {
+                    Query query = SortedNumericDocValuesField.newSlowRangeQuery(field, l, u);
+                    if (context.indexSortedOnField(field)) {
+                        query = new IndexSortSortedNumericDocValuesRangeQuery(field, l, u, query);
+                    }
+                    return query;
+                }
+                return IntPoint.newRangeQuery(field, l, u);
             }
 
             @Override
@@ -752,17 +875,28 @@ public Long parse(XContentParser parser, boolean coerce) throws IOException {
             }
 
             @Override
-            public Query termQuery(String field, Object value) {
+            public Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable) {
                 if (hasDecimalPart(value)) {
                     return Queries.newMatchNoDocsQuery("Value [" + value + "] has a decimal part");
                 }
                 long v = parse(value, true);
+                if (isSearchable && hasDocValues) {
+                    Query query = LongPoint.newExactQuery(field, v);
+                    Query dvQuery = SortedNumericDocValuesField.newSlowExactQuery(field, v);
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowExactQuery(field, v);
+
+                }
                 return LongPoint.newExactQuery(field, v);
             }
 
             @Override
-            public Query termsQuery(String field, List<Object> values) {
+            public Query termsQuery(String field, List<Object> values, boolean hasDocValues, boolean isSearchable) {
                 long[] v = new long[values.size()];
+
                 int upTo = 0;
 
                 for (int i = 0; i < values.size(); i++) {
@@ -778,6 +912,16 @@ public Query termsQuery(String field, List<Object> values) {
                 if (upTo != v.length) {
                     v = Arrays.copyOf(v, upTo);
                 }
+                if (isSearchable && hasDocValues) {
+                    return new IndexOrDocValuesQuery(
+                        LongPoint.newSetQuery(field, v),
+                        SortedNumericDocValuesField.newSlowSetQuery(field, v)
+                    );
+                }
+                if (hasDocValues) {
+                    return SortedNumericDocValuesField.newSlowSetQuery(field, v);
+
+                }
                 return LongPoint.newSetQuery(field, v);
             }
 
@@ -789,18 +933,28 @@ public Query rangeQuery(
                 boolean includeLower,
                 boolean includeUpper,
                 boolean hasDocValues,
+                boolean isSearchable,
                 QueryShardContext context
             ) {
                 return longRangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, (l, u) -> {
-                    Query query = LongPoint.newRangeQuery(field, l, u);
-                    if (hasDocValues) {
+                    if (isSearchable && hasDocValues) {
+                        Query query = LongPoint.newRangeQuery(field, l, u);
                         Query dvQuery = SortedNumericDocValuesField.newSlowRangeQuery(field, l, u);
                         query = new IndexOrDocValuesQuery(query, dvQuery);
                         if (context.indexSortedOnField(field)) {
                             query = new IndexSortSortedNumericDocValuesRangeQuery(field, l, u, query);
                         }
+                        return query;
                     }
-                    return query;
+                    if (hasDocValues) {
+                        Query query = SortedNumericDocValuesField.newSlowRangeQuery(field, l, u);
+                        if (context.indexSortedOnField(field)) {
+                            query = new IndexSortSortedNumericDocValuesRangeQuery(field, l, u, query);
+                        }
+                        return query;
+                    }
+                    return LongPoint.newRangeQuery(field, l, u);
+
                 });
             }
 
@@ -841,16 +995,24 @@ public BigInteger parse(XContentParser parser, boolean coerce) throws IOExceptio
             }
 
             @Override
-            public Query termQuery(String field, Object value) {
+            public Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable) {
                 if (hasDecimalPart(value)) {
                     return Queries.newMatchNoDocsQuery("Value [" + value + "] has a decimal part");
                 }
                 BigInteger v = parse(value, true);
+                if (isSearchable && hasDocValues) {
+                    Query query = BigIntegerPoint.newExactQuery(field, v);
+                    Query dvQuery = SortedUnsignedLongDocValuesSetQuery.newSlowExactQuery(field, v);
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+                }
+                if (hasDocValues) {
+                    return SortedUnsignedLongDocValuesSetQuery.newSlowExactQuery(field, v);
+                }
                 return BigIntegerPoint.newExactQuery(field, v);
             }
 
             @Override
-            public Query termsQuery(String field, List<Object> values) {
+            public Query termsQuery(String field, List<Object> values, boolean hasDocvalues, boolean isSearchable) {
                 BigInteger[] v = new BigInteger[values.size()];
                 int upTo = 0;
 
@@ -868,6 +1030,14 @@ public Query termsQuery(String field, List<Object> values) {
                     v = Arrays.copyOf(v, upTo);
                 }
 
+                if (isSearchable && hasDocvalues) {
+                    Query query = BigIntegerPoint.newSetQuery(field, v);
+                    Query dvQuery = SortedUnsignedLongDocValuesSetQuery.newSlowSetQuery(field, v);
+                    return new IndexOrDocValuesQuery(query, dvQuery);
+                }
+                if (hasDocvalues) {
+                    return SortedUnsignedLongDocValuesSetQuery.newSlowSetQuery(field, v);
+                }
                 return BigIntegerPoint.newSetQuery(field, v);
             }
 
@@ -879,15 +1049,19 @@ public Query rangeQuery(
                 boolean includeLower,
                 boolean includeUpper,
                 boolean hasDocValues,
+                boolean isSearchable,
                 QueryShardContext context
             ) {
                 return unsignedLongRangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, (l, u) -> {
-                    Query query = BigIntegerPoint.newRangeQuery(field, l, u);
-                    if (hasDocValues) {
+                    if (isSearchable && hasDocValues) {
+                        Query query = BigIntegerPoint.newRangeQuery(field, l, u);
                         Query dvQuery = SortedUnsignedLongDocValuesRangeQuery.newSlowRangeQuery(field, l, u);
-                        query = new IndexOrDocValuesQuery(query, dvQuery);
+                        return new IndexOrDocValuesQuery(query, dvQuery);
                     }
-                    return query;
+                    if (hasDocValues) {
+                        return SortedUnsignedLongDocValuesRangeQuery.newSlowRangeQuery(field, l, u);
+                    }
+                    return BigIntegerPoint.newRangeQuery(field, l, u);
                 });
             }
 
@@ -941,9 +1115,9 @@ public final TypeParser parser() {
             return parser;
         }
 
-        public abstract Query termQuery(String field, Object value);
+        public abstract Query termQuery(String field, Object value, boolean hasDocValues, boolean isSearchable);
 
-        public abstract Query termsQuery(String field, List<Object> values);
+        public abstract Query termsQuery(String field, List<Object> values, boolean hasDocValues, boolean isSearchable);
 
         public abstract Query rangeQuery(
             String field,
@@ -952,6 +1126,7 @@ public abstract Query rangeQuery(
             boolean includeLower,
             boolean includeUpper,
             boolean hasDocValues,
+            boolean isSearchable,
             QueryShardContext context
         );
 
@@ -1226,8 +1401,8 @@ public NumericType numericType() {
 
         @Override
         public Query termQuery(Object value, QueryShardContext context) {
-            failIfNotIndexed();
-            Query query = type.termQuery(name(), value);
+            failIfNotIndexedAndNoDocValues();
+            Query query = type.termQuery(name(), value, hasDocValues(), isSearchable());
             if (boost() != 1f) {
                 query = new BoostQuery(query, boost());
             }
@@ -1236,8 +1411,8 @@ public Query termQuery(Object value, QueryShardContext context) {
 
         @Override
         public Query termsQuery(List values, QueryShardContext context) {
-            failIfNotIndexed();
-            Query query = type.termsQuery(name(), values);
+            failIfNotIndexedAndNoDocValues();
+            Query query = type.termsQuery(name(), values, hasDocValues(), isSearchable());
             if (boost() != 1f) {
                 query = new BoostQuery(query, boost());
             }
@@ -1246,8 +1421,17 @@ public Query termsQuery(List values, QueryShardContext context) {
 
         @Override
         public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, QueryShardContext context) {
-            failIfNotIndexed();
-            Query query = type.rangeQuery(name(), lowerTerm, upperTerm, includeLower, includeUpper, hasDocValues(), context);
+            failIfNotIndexedAndNoDocValues();
+            Query query = type.rangeQuery(
+                name(),
+                lowerTerm,
+                upperTerm,
+                includeLower,
+                includeUpper,
+                hasDocValues(),
+                isSearchable(),
+                context
+            );
             if (boost() != 1f) {
                 query = new BoostQuery(query, boost());
             }
diff --git a/server/src/main/java/org/opensearch/index/query/FieldMaskingSpanQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/FieldMaskingSpanQueryBuilder.java
index 1162689a54689..4e73d87b07b7a 100644
--- a/server/src/main/java/org/opensearch/index/query/FieldMaskingSpanQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/FieldMaskingSpanQueryBuilder.java
@@ -54,7 +54,9 @@
  * @opensearch.internal
  */
 public class FieldMaskingSpanQueryBuilder extends AbstractQueryBuilder<FieldMaskingSpanQueryBuilder> implements SpanQueryBuilder {
-    public static final ParseField SPAN_FIELD_MASKING_FIELD = new ParseField("span_field_masking", "field_masking_span");
+
+    public static final String NAME = "span_field_masking";
+    public static final ParseField SPAN_FIELD_MASKING_FIELD = new ParseField(NAME, "field_masking_span");
 
     private static final ParseField FIELD_FIELD = new ParseField("field");
     private static final ParseField QUERY_FIELD = new ParseField("query");
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
index 5d5f55c7f4639..d0d00e4c4596a 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
@@ -283,6 +283,7 @@ protected Table getTableWithHeader(final RestRequest request) {
 
         table.addCell("path.data", "alias:pd,dataPath;default:false;text-align:right;desc:shard data path");
         table.addCell("path.state", "alias:ps,statsPath;default:false;text-align:right;desc:shard state path");
+        table.addCell("docs.deleted", "alias:dd,docsDeleted;default:false;text-align:right;desc:number of deleted docs in shard");
 
         table.endHeaders();
         return table;
@@ -448,6 +449,7 @@ Table buildTable(RestRequest request, ClusterStateResponse state, IndicesStatsRe
 
             table.addCell(getOrNull(shardStats, ShardStats::getDataPath, s -> s));
             table.addCell(getOrNull(shardStats, ShardStats::getStatePath, s -> s));
+            table.addCell(getOrNull(commonStats, CommonStats::getDocs, DocsStats::getDeleted));
 
             table.endRow();
         }
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/alias/AliasActionsTests.java b/server/src/test/java/org/opensearch/action/admin/indices/alias/AliasActionsTests.java
index 8ba8d226715ed..d463782a70506 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/alias/AliasActionsTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/alias/AliasActionsTests.java
@@ -241,6 +241,7 @@ public void testParseRemove() throws IOException {
         String[] indices = generateRandomStringArray(10, 5, false, false);
         String[] aliases = generateRandomStringArray(10, 5, false, false);
         XContentBuilder b = XContentBuilder.builder(randomFrom(XContentType.values()).xContent());
+        boolean mustExist = randomBoolean();
         b.startObject();
         {
             b.startObject("remove");
@@ -255,6 +256,9 @@ public void testParseRemove() throws IOException {
                 } else {
                     b.field("alias", aliases[0]);
                 }
+                if (mustExist) {
+                    b.field("must_exist", true);
+                }
             }
             b.endObject();
         }
@@ -265,6 +269,9 @@ public void testParseRemove() throws IOException {
             assertEquals(AliasActions.Type.REMOVE, action.actionType());
             assertThat(action.indices(), equalTo(indices));
             assertThat(action.aliases(), equalTo(aliases));
+            if (mustExist) {
+                assertThat(action.mustExist(), equalTo(true));
+            }
         }
     }
 
diff --git a/server/src/test/java/org/opensearch/action/search/SearchQueryCategorizerTests.java b/server/src/test/java/org/opensearch/action/search/SearchQueryCategorizerTests.java
index a2e301143d694..17fa124890158 100644
--- a/server/src/test/java/org/opensearch/action/search/SearchQueryCategorizerTests.java
+++ b/server/src/test/java/org/opensearch/action/search/SearchQueryCategorizerTests.java
@@ -34,16 +34,19 @@
 
 import java.util.Arrays;
 
-import org.mockito.Mockito;
+import org.mockito.ArgumentCaptor;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public final class SearchQueryCategorizerTests extends OpenSearchTestCase {
 
+    private static final String MULTI_TERMS_AGGREGATION = "multi_terms";
+
     private MetricsRegistry metricsRegistry;
 
     private SearchQueryCategorizer searchQueryCategorizer;
@@ -71,7 +74,20 @@ public void testAggregationsQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.aggCounter).add(eq(1.0d));
+        verify(searchQueryCategorizer.searchQueryCounters.aggCounter).add(eq(1.0d), any(Tags.class));
+
+        // capture the arguments passed to the aggCounter.add method
+        ArgumentCaptor<Double> valueCaptor = ArgumentCaptor.forClass(Double.class);
+        ArgumentCaptor<Tags> tagsCaptor = ArgumentCaptor.forClass(Tags.class);
+
+        // Verify that aggCounter.add was called with the expected arguments
+        verify(searchQueryCategorizer.searchQueryCounters.aggCounter).add(valueCaptor.capture(), tagsCaptor.capture());
+
+        double actualValue = valueCaptor.getValue();
+        String actualTag = (String) tagsCaptor.getValue().getTagsMap().get("type");
+
+        assertEquals(1.0d, actualValue, 0.0001);
+        assertEquals(MULTI_TERMS_AGGREGATION, actualTag);
     }
 
     public void testBoolQuery() {
@@ -81,8 +97,8 @@ public void testBoolQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.boolCounter).add(eq(1.0d), any(Tags.class));
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.matchCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.boolCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.matchCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testFunctionScoreQuery() {
@@ -92,7 +108,7 @@ public void testFunctionScoreQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.functionScoreCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.functionScoreCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testMatchQuery() {
@@ -102,7 +118,7 @@ public void testMatchQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.matchCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.matchCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testMatchPhraseQuery() {
@@ -112,7 +128,7 @@ public void testMatchPhraseQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.matchPhrasePrefixCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.matchPhrasePrefixCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testMultiMatchQuery() {
@@ -122,7 +138,7 @@ public void testMultiMatchQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.multiMatchCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.multiMatchCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testOtherQuery() {
@@ -136,8 +152,8 @@ public void testOtherQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.otherQueryCounter, times(2)).add(eq(1.0d), any(Tags.class));
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.termCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.otherQueryCounter, times(1)).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.termCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testQueryStringQuery() {
@@ -148,7 +164,7 @@ public void testQueryStringQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.queryStringQueryCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.queryStringCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testRangeQuery() {
@@ -160,7 +176,7 @@ public void testRangeQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.rangeCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.rangeCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testRegexQuery() {
@@ -169,7 +185,7 @@ public void testRegexQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.regexCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.regexpCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testSortQuery() {
@@ -180,8 +196,8 @@ public void testSortQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.matchCounter).add(eq(1.0d), any(Tags.class));
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.sortCounter, times(2)).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.matchCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.sortCounter, times(2)).add(eq(1.0d), any(Tags.class));
     }
 
     public void testTermQuery() {
@@ -191,7 +207,7 @@ public void testTermQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.termCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.termCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testWildcardQuery() {
@@ -201,7 +217,7 @@ public void testWildcardQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.wildcardCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.wildcardCounter).add(eq(1.0d), any(Tags.class));
     }
 
     public void testComplexQuery() {
@@ -219,10 +235,10 @@ public void testComplexQuery() {
 
         searchQueryCategorizer.categorize(sourceBuilder);
 
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.termCounter).add(eq(1.0d), any(Tags.class));
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.matchCounter).add(eq(1.0d), any(Tags.class));
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.regexCounter).add(eq(1.0d), any(Tags.class));
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.boolCounter).add(eq(1.0d), any(Tags.class));
-        Mockito.verify(searchQueryCategorizer.searchQueryCounters.aggCounter).add(eq(1.0d));
+        verify(searchQueryCategorizer.searchQueryCounters.termCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.matchCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.regexpCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.boolCounter).add(eq(1.0d), any(Tags.class));
+        verify(searchQueryCategorizer.searchQueryCounters.aggCounter).add(eq(1.0d), any(Tags.class));
     }
 }
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexAliasesServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexAliasesServiceTests.java
index bf66f577e182b..9fb4551f106ec 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexAliasesServiceTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexAliasesServiceTests.java
@@ -40,6 +40,7 @@
 import org.opensearch.common.util.set.Sets;
 import org.opensearch.core.index.Index;
 import org.opensearch.index.IndexNotFoundException;
+import org.opensearch.rest.action.admin.indices.AliasesNotFoundException;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.VersionUtils;
 
@@ -164,11 +165,11 @@ public void testMustExist() {
 
         // Show that removing non-existing alias with mustExist == true fails
         final ClusterState finalCS = after;
-        final IllegalArgumentException iae = expectThrows(
-            IllegalArgumentException.class,
+        final AliasesNotFoundException iae = expectThrows(
+            AliasesNotFoundException.class,
             () -> service.applyAliasActions(finalCS, singletonList(new AliasAction.Remove(index, "test_2", true)))
         );
-        assertThat(iae.getMessage(), containsString("required alias [test_2] does not exist"));
+        assertThat(iae.getMessage(), containsString("aliases [test_2] missing"));
     }
 
     public void testMultipleIndices() {
diff --git a/server/src/test/java/org/opensearch/common/xcontent/JsonToStringXContentParserTests.java b/server/src/test/java/org/opensearch/common/xcontent/JsonToStringXContentParserTests.java
new file mode 100644
index 0000000000000..0feb7bcd1ceec
--- /dev/null
+++ b/server/src/test/java/org/opensearch/common/xcontent/JsonToStringXContentParserTests.java
@@ -0,0 +1,113 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.common.xcontent;
+
+import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.test.OpenSearchTestCase;
+
+import java.io.IOException;
+
+public class JsonToStringXContentParserTests extends OpenSearchTestCase {
+
+    private String flattenJsonString(String fieldName, String in) throws IOException {
+        String transformed;
+        try (
+            XContentParser parser = JsonXContent.jsonXContent.createParser(
+                xContentRegistry(),
+                DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
+                in
+            )
+        ) {
+            JsonToStringXContentParser jsonToStringXContentParser = new JsonToStringXContentParser(
+                xContentRegistry(),
+                DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
+                parser,
+                fieldName
+            );
+            // Skip the START_OBJECT token:
+            jsonToStringXContentParser.nextToken();
+
+            XContentParser transformedParser = jsonToStringXContentParser.parseObject();
+            try (XContentBuilder jsonBuilder = XContentFactory.jsonBuilder()) {
+                jsonBuilder.copyCurrentStructure(transformedParser);
+                return jsonBuilder.toString();
+            }
+        }
+    }
+
+    public void testNestedObjects() throws IOException {
+        String jsonExample = "{" + "\"first\" : \"1\"," + "\"second\" : {" + "  \"inner\":  \"2.0\"" + "}," + "\"third\": \"three\"" + "}";
+
+        assertEquals(
+            "{"
+                + "\"flat\":[\"first\",\"second\",\"inner\",\"third\"],"
+                + "\"flat._value\":[\"1\",\"2.0\",\"three\"],"
+                + "\"flat._valueAndPath\":[\"flat.first=1\",\"flat.second.inner=2.0\",\"flat.third=three\"]"
+                + "}",
+            flattenJsonString("flat", jsonExample)
+        );
+    }
+
+    public void testChildHasDots() throws IOException {
+        // This should be exactly the same as testNestedObjects. We're just using the "flat" notation for the inner
+        // object.
+        String jsonExample = "{" + "\"first\" : \"1\"," + "\"second.inner\" : \"2.0\"," + "\"third\": \"three\"" + "}";
+
+        assertEquals(
+            "{"
+                + "\"flat\":[\"first\",\"second\",\"inner\",\"third\"],"
+                + "\"flat._value\":[\"1\",\"2.0\",\"three\"],"
+                + "\"flat._valueAndPath\":[\"flat.first=1\",\"flat.second.inner=2.0\",\"flat.third=three\"]"
+                + "}",
+            flattenJsonString("flat", jsonExample)
+        );
+    }
+
+    public void testNestChildObjectWithDots() throws IOException {
+        String jsonExample = "{"
+            + "\"first\" : \"1\","
+            + "\"second.inner\" : {"
+            + "  \"really_inner\" : \"2.0\""
+            + "},"
+            + "\"third\": \"three\""
+            + "}";
+
+        assertEquals(
+            "{"
+                + "\"flat\":[\"first\",\"second\",\"inner\",\"really_inner\",\"third\"],"
+                + "\"flat._value\":[\"1\",\"2.0\",\"three\"],"
+                + "\"flat._valueAndPath\":[\"flat.first=1\",\"flat.second.inner.really_inner=2.0\",\"flat.third=three\"]"
+                + "}",
+            flattenJsonString("flat", jsonExample)
+        );
+    }
+
+    public void testNestChildObjectWithDotsAndFieldWithDots() throws IOException {
+        String jsonExample = "{"
+            + "\"first\" : \"1\","
+            + "\"second.inner\" : {"
+            + "  \"totally.absolutely.inner\" : \"2.0\""
+            + "},"
+            + "\"third\": \"three\""
+            + "}";
+
+        assertEquals(
+            "{"
+                + "\"flat\":[\"first\",\"second\",\"inner\",\"totally\",\"absolutely\",\"inner\",\"third\"],"
+                + "\"flat._value\":[\"1\",\"2.0\",\"three\"],"
+                + "\"flat._valueAndPath\":[\"flat.first=1\",\"flat.second.inner.totally.absolutely.inner=2.0\",\"flat.third=three\"]"
+                + "}",
+            flattenJsonString("flat", jsonExample)
+        );
+    }
+
+}
diff --git a/server/src/test/java/org/opensearch/index/mapper/NumberFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/NumberFieldTypeTests.java
index 3c30bb81a9a32..af852b12e7a30 100644
--- a/server/src/test/java/org/opensearch/index/mapper/NumberFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/NumberFieldTypeTests.java
@@ -66,6 +66,7 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.document.SortedUnsignedLongDocValuesRangeQuery;
+import org.opensearch.index.document.SortedUnsignedLongDocValuesSetQuery;
 import org.opensearch.index.fielddata.IndexNumericFieldData;
 import org.opensearch.index.mapper.MappedFieldType.Relation;
 import org.opensearch.index.mapper.NumberFieldMapper.NumberFieldType;
@@ -118,15 +119,27 @@ public void testIsFieldWithinQuery() throws IOException {
 
     public void testIntegerTermsQueryWithDecimalPart() {
         MappedFieldType ft = new NumberFieldMapper.NumberFieldType("field", NumberType.INTEGER);
-        assertEquals(IntPoint.newSetQuery("field", 1), ft.termsQuery(Arrays.asList(1, 2.1), null));
-        assertEquals(IntPoint.newSetQuery("field", 1), ft.termsQuery(Arrays.asList(1.0, 2.1), null));
+        assertEquals(
+            new IndexOrDocValuesQuery(IntPoint.newSetQuery("field", 1), SortedNumericDocValuesField.newSlowSetQuery("field", 1)),
+            ft.termsQuery(Arrays.asList(1, 2.1), null)
+        );
+        assertEquals(
+            new IndexOrDocValuesQuery(IntPoint.newSetQuery("field", 1), SortedNumericDocValuesField.newSlowSetQuery("field", 1)),
+            ft.termsQuery(Arrays.asList(1.0, 2.1), null)
+        );
         assertTrue(ft.termsQuery(Arrays.asList(1.1, 2.1), null) instanceof MatchNoDocsQuery);
     }
 
     public void testLongTermsQueryWithDecimalPart() {
         MappedFieldType ft = new NumberFieldMapper.NumberFieldType("field", NumberType.LONG);
-        assertEquals(LongPoint.newSetQuery("field", 1), ft.termsQuery(Arrays.asList(1, 2.1), null));
-        assertEquals(LongPoint.newSetQuery("field", 1), ft.termsQuery(Arrays.asList(1.0, 2.1), null));
+        assertEquals(
+            new IndexOrDocValuesQuery(LongPoint.newSetQuery("field", 1), SortedNumericDocValuesField.newSlowSetQuery("field", 1)),
+            ft.termsQuery(Arrays.asList(1, 2.1), null)
+        );
+        assertEquals(
+            new IndexOrDocValuesQuery(LongPoint.newSetQuery("field", 1), SortedNumericDocValuesField.newSlowSetQuery("field", 1)),
+            ft.termsQuery(Arrays.asList(1.0, 2.1), null)
+        );
         assertTrue(ft.termsQuery(Arrays.asList(1.1, 2.1), null) instanceof MatchNoDocsQuery);
     }
 
@@ -151,16 +164,18 @@ public void testLongTermQueryWithDecimalPart() {
     }
 
     private static MappedFieldType unsearchable() {
-        return new NumberFieldType("field", NumberType.LONG, false, false, true, true, null, Collections.emptyMap());
+        return new NumberFieldType("field", NumberType.LONG, false, false, false, true, null, Collections.emptyMap());
     }
 
     public void testTermQuery() {
         MappedFieldType ft = new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.LONG);
-        assertEquals(LongPoint.newExactQuery("field", 42), ft.termQuery("42", null));
+        Query dvQuery = SortedNumericDocValuesField.newSlowExactQuery("field", 42);
+        Query query = new IndexOrDocValuesQuery(LongPoint.newExactQuery("field", 42), dvQuery);
+        assertEquals(query, ft.termQuery("42", null));
 
         MappedFieldType unsearchable = unsearchable();
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> unsearchable.termQuery("42", null));
-        assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
+        assertEquals("Cannot search on field [field] since it is both not indexed, and does not have doc_values enabled.", e.getMessage());
     }
 
     public void testRangeQueryWithNegativeBounds() {
@@ -380,7 +395,7 @@ public void testLongRangeQuery() {
             IllegalArgumentException.class,
             () -> unsearchable.rangeQuery("1", "3", true, true, null, null, null, MOCK_QSC)
         );
-        assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
+        assertEquals("Cannot search on field [field] since it is both not indexed, and does not have doc_values enabled.", e.getMessage());
     }
 
     public void testUnsignedLongRangeQuery() {
@@ -396,7 +411,23 @@ public void testUnsignedLongRangeQuery() {
             IllegalArgumentException.class,
             () -> unsearchable.rangeQuery("1", "3", true, true, null, null, null, MOCK_QSC)
         );
-        assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
+        assertEquals("Cannot search on field [field] since it is both not indexed, and does not have doc_values enabled.", e.getMessage());
+    }
+
+    public void testUnsignedLongTermsQuery() {
+        MappedFieldType ft = new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.UNSIGNED_LONG);
+        Query expected = new IndexOrDocValuesQuery(
+            BigIntegerPoint.newSetQuery("field", BigInteger.valueOf(1), BigInteger.valueOf(3)),
+            SortedUnsignedLongDocValuesSetQuery.newSlowSetQuery("field", BigInteger.valueOf(1), BigInteger.valueOf(3))
+        );
+        assertEquals(expected, ft.termsQuery(List.of("1", "3"), MOCK_QSC));
+
+        MappedFieldType unsearchable = unsearchable();
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
+            () -> unsearchable.termsQuery(List.of("1", "3"), MOCK_QSC)
+        );
+        assertEquals("Cannot search on field [field] since it is both not indexed, and does not have doc_values enabled.", e.getMessage());
     }
 
     public void testDoubleRangeQuery() {
@@ -416,7 +447,7 @@ public void testDoubleRangeQuery() {
             IllegalArgumentException.class,
             () -> unsearchable.rangeQuery("1", "3", true, true, null, null, null, MOCK_QSC)
         );
-        assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
+        assertEquals("Cannot search on field [field] since it is both not indexed, and does not have doc_values enabled.", e.getMessage());
     }
 
     public void testConversions() {
@@ -518,8 +549,8 @@ public void testHalfFloatRange() throws IOException {
             float u = (randomFloat() * 2 - 1) * 65504;
             boolean includeLower = randomBoolean();
             boolean includeUpper = randomBoolean();
-            Query floatQ = NumberType.FLOAT.rangeQuery("float", l, u, includeLower, includeUpper, false, MOCK_QSC);
-            Query halfFloatQ = NumberType.HALF_FLOAT.rangeQuery("half_float", l, u, includeLower, includeUpper, false, MOCK_QSC);
+            Query floatQ = NumberType.FLOAT.rangeQuery("float", l, u, includeLower, includeUpper, false, true, MOCK_QSC);
+            Query halfFloatQ = NumberType.HALF_FLOAT.rangeQuery("half_float", l, u, includeLower, includeUpper, false, true, MOCK_QSC);
             assertEquals(searcher.count(floatQ), searcher.count(halfFloatQ));
         }
         IOUtils.close(reader, dir);
@@ -549,8 +580,17 @@ public void testUnsignedLongRange() throws IOException {
             BigInteger u = randomUnsignedLong();
             boolean includeLower = randomBoolean();
             boolean includeUpper = randomBoolean();
-            Query unsignedLongQ = NumberType.UNSIGNED_LONG.rangeQuery("unsigned_long", l, u, includeLower, includeUpper, false, MOCK_QSC);
-            Query doubleQ = NumberType.DOUBLE.rangeQuery("double", l, u, includeLower, includeUpper, false, MOCK_QSC);
+            Query unsignedLongQ = NumberType.UNSIGNED_LONG.rangeQuery(
+                "unsigned_long",
+                l,
+                u,
+                includeLower,
+                includeUpper,
+                false,
+                true,
+                MOCK_QSC
+            );
+            Query doubleQ = NumberType.DOUBLE.rangeQuery("double", l, u, includeLower, includeUpper, false, true, MOCK_QSC);
             assertEquals(searcher.count(doubleQ), searcher.count(unsignedLongQ));
         }
         IOUtils.close(reader, dir);
@@ -558,21 +598,23 @@ public void testUnsignedLongRange() throws IOException {
 
     public void testNegativeZero() {
         assertEquals(
-            NumberType.DOUBLE.rangeQuery("field", null, -0d, true, true, false, MOCK_QSC),
-            NumberType.DOUBLE.rangeQuery("field", null, +0d, true, false, false, MOCK_QSC)
+            NumberType.DOUBLE.rangeQuery("field", null, -0d, true, true, false, true, MOCK_QSC),
+            NumberType.DOUBLE.rangeQuery("field", null, +0d, true, false, false, true, MOCK_QSC)
         );
         assertEquals(
-            NumberType.FLOAT.rangeQuery("field", null, -0f, true, true, false, MOCK_QSC),
-            NumberType.FLOAT.rangeQuery("field", null, +0f, true, false, false, MOCK_QSC)
+            NumberType.FLOAT.rangeQuery("field", null, -0f, true, true, false, true, MOCK_QSC),
+            NumberType.FLOAT.rangeQuery("field", null, +0f, true, false, false, true, MOCK_QSC)
         );
         assertEquals(
-            NumberType.HALF_FLOAT.rangeQuery("field", null, -0f, true, true, false, MOCK_QSC),
-            NumberType.HALF_FLOAT.rangeQuery("field", null, +0f, true, false, false, MOCK_QSC)
+            NumberType.HALF_FLOAT.rangeQuery("field", null, -0f, true, true, false, true, MOCK_QSC),
+            NumberType.HALF_FLOAT.rangeQuery("field", null, +0f, true, false, false, true, MOCK_QSC)
         );
 
-        assertFalse(NumberType.DOUBLE.termQuery("field", -0d).equals(NumberType.DOUBLE.termQuery("field", +0d)));
-        assertFalse(NumberType.FLOAT.termQuery("field", -0f).equals(NumberType.FLOAT.termQuery("field", +0f)));
-        assertFalse(NumberType.HALF_FLOAT.termQuery("field", -0f).equals(NumberType.HALF_FLOAT.termQuery("field", +0f)));
+        assertFalse(NumberType.DOUBLE.termQuery("field", -0d, true, true).equals(NumberType.DOUBLE.termQuery("field", +0d, true, true)));
+        assertFalse(NumberType.FLOAT.termQuery("field", -0f, true, true).equals(NumberType.FLOAT.termQuery("field", +0f, true, true)));
+        assertFalse(
+            NumberType.HALF_FLOAT.termQuery("field", -0f, true, true).equals(NumberType.HALF_FLOAT.termQuery("field", +0f, true, true))
+        );
     }
 
     // Make sure we construct the IndexOrDocValuesQuery objects with queries that match
@@ -628,6 +670,7 @@ public void doTestDocValueRangeQueries(NumberType type, Supplier<Number> valueSu
                 randomBoolean(),
                 randomBoolean(),
                 true,
+                true,
                 MOCK_QSC
             );
             assertThat(query, instanceOf(IndexOrDocValuesQuery.class));
@@ -708,6 +751,7 @@ public void doTestIndexSortRangeQueries(NumberType type, Supplier<Number> valueS
                 randomBoolean(),
                 randomBoolean(),
                 true,
+                true,
                 context
             );
             assertThat(query, instanceOf(IndexSortSortedNumericDocValuesRangeQuery.class));
diff --git a/server/src/test/java/org/opensearch/index/query/TermQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/TermQueryBuilderTests.java
index 3ac9bce840a20..c5bdf9b586df1 100644
--- a/server/src/test/java/org/opensearch/index/query/TermQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/TermQueryBuilderTests.java
@@ -36,6 +36,7 @@
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.AutomatonQuery;
+import org.apache.lucene.search.IndexOrDocValuesQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.PointRangeQuery;
 import org.apache.lucene.search.Query;
@@ -112,6 +113,7 @@ protected void doAssertLuceneQuery(TermQueryBuilder queryBuilder, Query query, Q
             either(instanceOf(TermQuery.class)).or(instanceOf(PointRangeQuery.class))
                 .or(instanceOf(MatchNoDocsQuery.class))
                 .or(instanceOf(AutomatonQuery.class))
+                .or(instanceOf(IndexOrDocValuesQuery.class))
         );
         MappedFieldType mapper = context.fieldMapper(queryBuilder.fieldName());
         if (query instanceof TermQuery) {
diff --git a/server/src/test/java/org/opensearch/index/query/TermsQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/TermsQueryBuilderTests.java
index b587bec2d5343..32bf290627b63 100644
--- a/server/src/test/java/org/opensearch/index/query/TermsQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/TermsQueryBuilderTests.java
@@ -34,6 +34,7 @@
 
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.ConstantScoreQuery;
+import org.apache.lucene.search.IndexOrDocValuesQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.PointInSetQuery;
 import org.apache.lucene.search.Query;
@@ -135,6 +136,7 @@ protected void doAssertLuceneQuery(TermsQueryBuilder queryBuilder, Query query,
                 either(instanceOf(TermInSetQuery.class)).or(instanceOf(PointInSetQuery.class))
                     .or(instanceOf(ConstantScoreQuery.class))
                     .or(instanceOf(MatchNoDocsQuery.class))
+                    .or(instanceOf(IndexOrDocValuesQuery.class))
             );
             if (query instanceof ConstantScoreQuery) {
                 assertThat(((ConstantScoreQuery) query).getQuery(), instanceOf(BooleanQuery.class));
diff --git a/server/src/test/java/org/opensearch/index/shard/RemoteIndexShardTests.java b/server/src/test/java/org/opensearch/index/shard/RemoteIndexShardTests.java
index dd92bfb47afdb..eacc504428ef1 100644
--- a/server/src/test/java/org/opensearch/index/shard/RemoteIndexShardTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/RemoteIndexShardTests.java
@@ -11,6 +11,7 @@
 import org.apache.lucene.index.IndexFileNames;
 import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.util.Version;
+import org.opensearch.action.StepListener;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.concurrent.GatedCloseable;
 import org.opensearch.common.settings.Settings;
@@ -371,7 +372,6 @@ public void testPrimaryRestart() throws Exception {
      * prevent FileAlreadyExistsException. It does so by only copying files in first round of segment replication without
      * committing locally so that in next round of segment replication those files are not considered for download again
      */
-    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/10885")
     public void testSegRepSucceedsOnPreviousCopiedFiles() throws Exception {
         try (ReplicationGroup shards = createGroup(1, getIndexSettings(), new NRTReplicationEngineFactory())) {
             shards.startAll();
@@ -388,6 +388,7 @@ public void testSegRepSucceedsOnPreviousCopiedFiles() throws Exception {
             );
             CountDownLatch latch = new CountDownLatch(1);
 
+            logger.info("--> Starting first round of replication");
             // Start first round of segment replication. This should fail with simulated error but with replica having
             // files in its local store but not in active reader.
             final SegmentReplicationTarget target = targetService.startReplication(
@@ -427,6 +428,7 @@ public void onReplicationFailure(
             // Start next round of segment replication and not throwing exception resulting in commit on replica
             when(sourceFactory.get(any())).thenReturn(getRemoteStoreReplicationSource(replica, () -> {}));
             CountDownLatch waitForSecondRound = new CountDownLatch(1);
+            logger.info("--> Starting second round of replication");
             final SegmentReplicationTarget newTarget = targetService.startReplication(
                 replica,
                 primary.getLatestReplicationCheckpoint(),
@@ -560,8 +562,19 @@ public void getSegmentFiles(
                 BiConsumer<String, Long> fileProgressTracker,
                 ActionListener<GetSegmentFilesResponse> listener
             ) {
-                super.getSegmentFiles(replicationId, checkpoint, filesToFetch, indexShard, (fileName, bytesRecovered) -> {}, listener);
-                postGetFilesRunnable.run();
+                StepListener<GetSegmentFilesResponse> waitForCopyFilesListener = new StepListener();
+                super.getSegmentFiles(
+                    replicationId,
+                    checkpoint,
+                    filesToFetch,
+                    indexShard,
+                    (fileName, bytesRecovered) -> {},
+                    waitForCopyFilesListener
+                );
+                waitForCopyFilesListener.whenComplete(response -> {
+                    postGetFilesRunnable.run();
+                    listener.onResponse(response);
+                }, listener::onFailure);
             }
 
             @Override
diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java
index a8679a087216d..73f83a5642bb4 100644
--- a/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java
+++ b/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java
@@ -46,6 +46,7 @@
 import org.opensearch.cluster.routing.ShardRoutingState;
 import org.opensearch.cluster.routing.TestShardRouting;
 import org.opensearch.common.Table;
+import org.opensearch.index.shard.DocsStats;
 import org.opensearch.index.shard.ShardPath;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.rest.FakeRestRequest;
@@ -65,6 +66,8 @@ public class RestShardsActionTests extends OpenSearchTestCase {
 
     public void testBuildTable() {
         final int numShards = randomIntBetween(1, 5);
+        long numDocs = randomLongBetween(0, 10000);
+        long numDeletedDocs = randomLongBetween(0, 100);
         DiscoveryNode localNode = new DiscoveryNode("local", buildNewFakeTransportAddress(), Version.CURRENT);
 
         List<ShardRouting> shardRoutings = new ArrayList<>(numShards);
@@ -76,10 +79,12 @@ public void testBuildTable() {
             Path path = createTempDir().resolve("indices")
                 .resolve(shardRouting.shardId().getIndex().getUUID())
                 .resolve(String.valueOf(shardRouting.shardId().id()));
+            CommonStats commonStats = new CommonStats();
+            commonStats.docs = new DocsStats(numDocs, numDeletedDocs, 0);
             ShardStats shardStats = new ShardStats(
                 shardRouting,
                 new ShardPath(false, path, path, shardRouting.shardId()),
-                null,
+                commonStats,
                 null,
                 null,
                 null
@@ -120,6 +125,7 @@ public void testBuildTable() {
         assertThat(headers.get(6).value, equalTo("ip"));
         assertThat(headers.get(7).value, equalTo("id"));
         assertThat(headers.get(8).value, equalTo("node"));
+        assertThat(headers.get(74).value, equalTo("docs.deleted"));
 
         final List<List<Table.Cell>> rows = table.getRows();
         assertThat(rows.size(), equalTo(numShards));
@@ -132,10 +138,12 @@ public void testBuildTable() {
             assertThat(row.get(1).value, equalTo(shardRouting.getId()));
             assertThat(row.get(2).value, equalTo(shardRouting.primary() ? "p" : "r"));
             assertThat(row.get(3).value, equalTo(shardRouting.state()));
+            assertThat(row.get(4).value, equalTo(shardStats.getStats().getDocs().getCount()));
             assertThat(row.get(6).value, equalTo(localNode.getHostAddress()));
             assertThat(row.get(7).value, equalTo(localNode.getId()));
             assertThat(row.get(72).value, equalTo(shardStats.getDataPath()));
             assertThat(row.get(73).value, equalTo(shardStats.getStatePath()));
+            assertThat(row.get(74).value, equalTo(shardStats.getStats().getDocs().getDeleted()));
         }
     }
 }
diff --git a/test/framework/src/main/java/org/opensearch/index/alias/RandomAliasActionsGenerator.java b/test/framework/src/main/java/org/opensearch/index/alias/RandomAliasActionsGenerator.java
index ce862d2b69d8f..fb9db9a578b4a 100644
--- a/test/framework/src/main/java/org/opensearch/index/alias/RandomAliasActionsGenerator.java
+++ b/test/framework/src/main/java/org/opensearch/index/alias/RandomAliasActionsGenerator.java
@@ -102,6 +102,11 @@ public static AliasActions randomAliasAction(boolean useStringAsFilter) {
                 action.isHidden(randomBoolean());
             }
         }
+        if (action.actionType() == AliasActions.Type.REMOVE) {
+            if (randomBoolean()) {
+                action.mustExist(randomBoolean());
+            }
+        }
         return action;
     }
 
diff --git a/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java
index 30cc48c588be1..102c641746b01 100644
--- a/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java
+++ b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java
@@ -35,6 +35,7 @@
 import org.opensearch.index.engine.Engine;
 import org.opensearch.index.engine.EngineConfig;
 import org.opensearch.index.engine.EngineFactory;
+import org.opensearch.index.engine.NRTReplicationEngine;
 
 public final class MockEngineFactory implements EngineFactory {
 
@@ -46,6 +47,12 @@ public MockEngineFactory(Class<? extends FilterDirectoryReader> wrapper) {
 
     @Override
     public Engine newReadWriteEngine(EngineConfig config) {
-        return new MockInternalEngine(config, wrapper);
+
+        /**
+         * Segment replication enabled replicas (i.e. read only replicas) do not use an InternalEngine so a MockInternalEngine
+         * will not work and an NRTReplicationEngine must be used instead. The primary shards for these indexes will
+         * still use a MockInternalEngine.
+         */
+        return config.isReadOnlyReplica() ? new NRTReplicationEngine(config) : new MockInternalEngine(config, wrapper);
     }
 }