diff --git a/.ci/bwcVersions b/.ci/bwcVersions
index 144a8b71fca39..6a5db93053e3b 100644
--- a/.ci/bwcVersions
+++ b/.ci/bwcVersions
@@ -26,4 +26,5 @@ BWC_VERSION:
   - "2.10.1"
   - "2.11.0"
   - "2.11.1"
+  - "2.11.2"
   - "2.12.0"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8076adcf00ca9..68d02d5f7d544 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,27 @@
-*   @abbashus @adnapibar @anasalkouz @andrross @Bukhtawar @CEHENKLE @dblock @dbwiddis @dreamer-89 @gbbafna @kartg @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @peternied @reta @Rishikesh1159 @ryanbogan @sachinpkale @saratvemulapalli @setiah @shwetathareja @sohami @tlfeng @VachaShah
+# CODEOWNERS manages notifications, not PR approvals
+# For PR approvals see /.github/workflows/maintainer-approval.yml 
+
+# Files have a single rule applied, the last match decides the owner
+# If you would like to more specifically apply ownership, include existing owner in new sub fields
+
+# To verify changes of CODEOWNERS file
+# In VSCode
+#   1. Install extension https://marketplace.visualstudio.com/items?itemName=jasonnutter.vscode-codeowners
+#   2. Go to a file
+#   3. Use the command palette to run the CODEOWNERS: Show owners of current file command, which will display all code owners for the current file.
+
+# Default ownership for all repo files
+* @abbashus @adnapibar @anasalkouz @andrross @Bukhtawar @CEHENKLE @dblock @dbwiddis @dreamer-89 @gbbafna @kartg @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @reta @Rishikesh1159 @ryanbogan @sachinpkale @saratvemulapalli @setiah @shwetathareja @sohami @tlfeng @VachaShah
+
+/modules/transport-netty4/ @peternied
+
+/plugins/identity-shiro/ @peternied
+
+/server/src/main/java/org/opensearch/extensions/ @peternied
+/server/src/main/java/org/opensearch/identity/ @peternied
+/server/src/main/java/org/opensearch/threadpool/ @peternied
+/server/src/main/java/org/opensearch/transport/ @peternied
+
+/.github/ @peternied
+
+/MAINTAINERS.md @abbashus @adnapibar @anasalkouz @andrross @Bukhtawar @CEHENKLE @dblock @dbwiddis @dreamer-89 @gbbafna @kartg @kotwanikunal @mch2 @msfroh @nknize @owaiskazi19 @peternied @reta @Rishikesh1159 @ryanbogan @sachinpkale @saratvemulapalli @setiah @shwetathareja @sohami @tlfeng @VachaShah
diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_template.md
deleted file mode 100644
index be3ae51b237ee..0000000000000
--- a/.github/ISSUE_TEMPLATE/bug_template.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: 🐛 Bug report
-about: Create a report to help us improve
-title: "[BUG]"
-labels: 'bug, untriaged'
-assignees: ''
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Plugins**
-Please list all plugins currently enabled.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Host/Environment (please complete the following information):**
- - OS: [e.g. iOS]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_template.yml b/.github/ISSUE_TEMPLATE/bug_template.yml
new file mode 100644
index 0000000000000..2cd1ee8a7e688
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_template.yml
@@ -0,0 +1,79 @@
+name: 🐛 Bug report
+description: Create a report to help us improve
+title: "[BUG] <title>"
+labels: ['bug, untriaged']
+body:
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Related component
+      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
+        - Build
+        - Clients
+        - Cluster Manager
+        - Extensions
+        - Indexing:Performance
+        - Indexing:Replication
+        - Indexing
+        - Libraries
+        - Plugins
+        - Search:Aggregations
+        - Search:Performance
+        - Search:Query Capabilities
+        - Search:Query Insights
+        - Search:Relevance
+        - Search:Remote Search
+        - Search:Resiliency
+        - Search:Searchable Snapshots
+        - Search
+        - Storage:Durability
+        - Storage:Performance
+        - Storage:Remote
+        - Storage:Snapshots
+        - Storage
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior.
+      value: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional Details
+      description: Add any other context about the problem here.
+      value: |
+        **Plugins**
+        Please list all plugins currently enabled.
+
+        **Screenshots**
+        If applicable, add screenshots to help explain your problem.
+
+        **Host/Environment (please complete the following information):**
+         - OS: [e.g. iOS]
+         - Version [e.g. 22]
+
+        **Additional context**
+        Add any other context about the problem here.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 53b3614a34342..0000000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: 🎆 Feature request
-about: Suggest an idea for this project
-title: ''
-labels: 'enhancement, untriaged'
-assignees: ''
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000000..d93ac8b590706
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,62 @@
+name: 🎆 Feature request
+description: Suggest an idea for this project
+title: '[Feature Request] <title>'
+labels: ['enhancement, untriaged']
+body:
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe
+      description: A clear and concise description of what the problem is.
+      placeholder: Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Related component
+      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
+        - Build
+        - Clients
+        - Cluster Manager
+        - Extensions
+        - Indexing:Performance
+        - Indexing:Replication
+        - Indexing
+        - Libraries
+        - Plugins
+        - Search:Aggregations
+        - Search:Performance
+        - Search:Query Capabilities
+        - Search:Query Insights
+        - Search:Relevance
+        - Search:Remote Search
+        - Search:Resiliency
+        - Search:Searchable Snapshots
+        - Search
+        - Storage:Durability
+        - Storage:Performance
+        - Storage:Remote
+        - Storage:Snapshots
+        - Storage
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
diff --git a/.github/workflows/add-untriaged.yml b/.github/workflows/add-untriaged.yml
deleted file mode 100644
index 38de96f663051..0000000000000
--- a/.github/workflows/add-untriaged.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Apply 'untriaged' label during issue lifecycle
-
-on:
-  issues:
-    types: [opened, reopened, transferred]
-
-jobs:
-  apply-label:
-    if: github.repository == 'opensearch-project/OpenSearch'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v7
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ['untriaged']
-            })
diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml
index 87cecdf38c072..382105364c048 100644
--- a/.github/workflows/assemble.yml
+++ b/.github/workflows/assemble.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
diff --git a/.github/workflows/check-compatibility.yml b/.github/workflows/check-compatibility.yml
index d93f7e73b91e7..d6c65ddd446cd 100644
--- a/.github/workflows/check-compatibility.yml
+++ b/.github/workflows/check-compatibility.yml
@@ -36,7 +36,7 @@ jobs:
           echo "### Compatible components"   >> "${{ github.workspace }}/results.txt" && grep -e 'Compatible component'   $HOME/gradlew-check.out | sed -e 's/Compatible component: \[\(.*\)\]/- \1/'   >> "${{ github.workspace }}/results.txt"
 
       - name: Upload results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: results.txt
           path: ${{ github.workspace }}/results.txt
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: results.txt
 
diff --git a/.github/workflows/lucene-snapshots.yml b/.github/workflows/lucene-snapshots.yml
index d6b37051c032e..05ca93e7be2aa 100644
--- a/.github/workflows/lucene-snapshots.yml
+++ b/.github/workflows/lucene-snapshots.yml
@@ -35,7 +35,7 @@ jobs:
           echo "REVISION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Setup JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: 'temurin'
diff --git a/.github/workflows/maintainer-approval.yml b/.github/workflows/maintainer-approval.yml
new file mode 100644
index 0000000000000..2f87afd372d90
--- /dev/null
+++ b/.github/workflows/maintainer-approval.yml
@@ -0,0 +1,33 @@
+name: Maintainers approval
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  maintainer-approved-check:
+    name: Minimum approval count
+    runs-on: ubuntu-latest
+    steps:
+      - id: find-maintainers
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          result-encoding: string
+          script: |
+            // Get the collaborators - filtered to maintainer permissions
+            const maintainersResponse = await github.request('GET /repos/{owner}/{repo}/collaborators', {
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                permission: 'maintain',
+                affiliation: 'all',
+                per_page: 100
+            });
+
+            return maintainersResponse.data.map(item => item.login).join(', ');
+
+      - uses: peternied/required-approval@v1.2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-required: 1
+          required-approvers-list: ${{ steps.find-maintainers.outputs.result }}
diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
index cd75eb47946a4..800aacec98516 100644
--- a/.github/workflows/precommit.yml
+++ b/.github/workflows/precommit.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
diff --git a/.github/workflows/publish-maven-snapshots.yml b/.github/workflows/publish-maven-snapshots.yml
index 93bbfb8bbeab8..1b2db22c7c20b 100644
--- a/.github/workflows/publish-maven-snapshots.yml
+++ b/.github/workflows/publish-maven-snapshots.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: adopt
           java-version: 17
diff --git a/.github/workflows/stalled.yml b/.github/workflows/stalled.yml
index 19ec9c9438bbe..d171332b402f1 100644
--- a/.github/workflows/stalled.yml
+++ b/.github/workflows/stalled.yml
@@ -17,7 +17,7 @@ jobs:
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
           installation_id: 22958780
       - name: Stale PRs
-        uses: actions/stale@v8
+        uses: actions/stale@v9
         with:
           repo-token: ${{ steps.github_app_token.outputs.token }}
           stale-pr-label: 'stalled'
diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
new file mode 100644
index 0000000000000..c305818bdb0a9
--- /dev/null
+++ b/.github/workflows/triage.yml
@@ -0,0 +1,34 @@
+name: Auto triage based on the component label in issue
+
+on:
+  issues:
+    types: [opened, reopened, transferred]
+
+jobs:
+  apply-label:
+    if: github.repository == 'opensearch-project/OpenSearch'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const { issue, repository } = context.payload;
+            const { number, body } = issue;
+            const { owner, name } = repository;
+            const regex = /###\sRelated\scomponent\n\n(\w.*)\n/gm;
+            let match;
+            while ( ( match = regex.exec( body ) ) ) {
+              const [ , component_label ] = match;
+              await github.rest.issues.addLabels( {
+                owner: owner.login,
+                repo: name,
+                issue_number: number,
+                labels: [ `${ component_label }` ],
+              } );
+            }
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['untriaged']
+            })
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36c2d0f898eba..842b95f3e54a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add getter for path field in NestedQueryBuilder ([#4636](https://github.com/opensearch-project/OpenSearch/pull/4636))
 - Allow mmap to use new JDK-19 preview APIs in Apache Lucene 9.4+ ([#5151](https://github.com/opensearch-project/OpenSearch/pull/5151))
 - Add events correlation engine plugin ([#6854](https://github.com/opensearch-project/OpenSearch/issues/6854))
-- Introduce new dynamic cluster setting to control slice computation for concurrent segment search ([#9107](https://github.com/opensearch-project/OpenSearch/pull/9107))
 - Implement on behalf of token passing for extensions ([#8679](https://github.com/opensearch-project/OpenSearch/pull/8679), [#10664](https://github.com/opensearch-project/OpenSearch/pull/10664))
 - Provide service accounts tokens to extensions ([#9618](https://github.com/opensearch-project/OpenSearch/pull/9618))
 - [AdmissionControl] Added changes for AdmissionControl Interceptor and AdmissionControlService for RateLimiting ([#9286](https://github.com/opensearch-project/OpenSearch/pull/9286))
@@ -45,7 +44,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.bouncycastle:bcmail-jdk15on` to `org.bouncycastle:bcmail-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247))
 - Bump `org.bouncycastle:bcpkix-jdk15on` to `org.bouncycastle:bcpkix-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247))
 - Bump JNA version from 5.5 to 5.13 ([#9963](https://github.com/opensearch-project/OpenSearch/pull/9963))
-- Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822))
 - Bump `org.eclipse.jgit` from 6.5.0 to 6.7.0 ([#10147](https://github.com/opensearch-project/OpenSearch/pull/10147))
 - Bump OpenTelemetry from 1.30.1 to 1.31.0 ([#10617](https://github.com/opensearch-project/OpenSearch/pull/10617))
 - Bump OpenTelemetry from 1.31.0 to 1.32.0 and OpenTelemetry Semconv from 1.21.0-alpha to 1.23.1-alpha ([#11305](https://github.com/opensearch-project/OpenSearch/pull/11305))
@@ -58,7 +56,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Improve summary error message for invalid setting updates ([#4792](https://github.com/opensearch-project/OpenSearch/pull/4792))
 - Return 409 Conflict HTTP status instead of 503 on failure to concurrently execute snapshots ([#8986](https://github.com/opensearch-project/OpenSearch/pull/5855))
 - Add task completion count in search backpressure stats API ([#10028](https://github.com/opensearch-project/OpenSearch/pull/10028/))
-- Performance improvement for Datetime field caching ([#4558](https://github.com/opensearch-project/OpenSearch/issues/4558))
 - Deprecate CamelCase `PathHierarchy` tokenizer name in favor to lowercase `path_hierarchy` ([#10894](https://github.com/opensearch-project/OpenSearch/pull/10894))
 
 
@@ -84,8 +81,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix 'org.apache.hc.core5.http.ParseException: Invalid protocol version' under JDK 16+ ([#4827](https://github.com/opensearch-project/OpenSearch/pull/4827))
 - Fix compression support for h2c protocol ([#4944](https://github.com/opensearch-project/OpenSearch/pull/4944))
 - Don't over-allocate in HeapBufferedAsyncEntityConsumer in order to consume the response ([#9993](https://github.com/opensearch-project/OpenSearch/pull/9993))
-- [BUG] Fix the thread context that is not properly cleared and messes up the traces ([#10873](https://github.com/opensearch-project/OpenSearch/pull/10873))
-- Handle canMatchSearchAfter for frozen context scenario ([#11249](https://github.com/opensearch-project/OpenSearch/pull/11249))
+- Update supported version for max_shard_size parameter in Shrink API ([#11439](https://github.com/opensearch-project/OpenSearch/pull/11439))
 
 ### Security
 
@@ -94,6 +90,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Admission control] Add Resource usage collector service and resource usage tracker  ([#9890](https://github.com/opensearch-project/OpenSearch/pull/9890))
 - [Admission control] Add enhancements to FS stats to include read/write time, queue size and IO time ([#10541](https://github.com/opensearch-project/OpenSearch/pull/10541))
 - [Remote cluster state] Change file names for remote cluster state ([#10557](https://github.com/opensearch-project/OpenSearch/pull/10557))
+- [Search Pipelines] Add request-scoped state shared between processors (and three new processors) ([#9405](https://github.com/opensearch-project/OpenSearch/pull/9405))
+- Per request phase latency ([#10351](https://github.com/opensearch-project/OpenSearch/issues/10351))
 - [Remote Store] Add repository stats for remote store([#10567](https://github.com/opensearch-project/OpenSearch/pull/10567))
 - [Remote cluster state] Upload global metadata in cluster state to remote store([#10404](https://github.com/opensearch-project/OpenSearch/pull/10404))
 - [Remote cluster state] Download functionality of global metadata from remote store ([#10535](https://github.com/opensearch-project/OpenSearch/pull/10535))
@@ -116,42 +114,65 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Make number of segment metadata files in remote segment store configurable ([#11329](https://github.com/opensearch-project/OpenSearch/pull/11329))
 - Allow changing number of replicas of searchable snapshot index ([#11317](https://github.com/opensearch-project/OpenSearch/pull/11317))
 - Adding slf4j license header to LoggerMessageFormat.java ([#11069](https://github.com/opensearch-project/OpenSearch/pull/11069))
+- [BWC and API enforcement] Introduce checks for enforcing the API restrictions ([#11175](https://github.com/opensearch-project/OpenSearch/pull/11175))
+- Maintainer approval check ([#11378](https://github.com/opensearch-project/OpenSearch/pull/11378))
+- Create separate transport action for render search template action ([#11170](https://github.com/opensearch-project/OpenSearch/pull/11170))
+- 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))
 
 ### 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.0 ([#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))
+- 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 `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.5.0 ([#10295](https://github.com/opensearch-project/OpenSearch/pull/10295))
+- 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))
 - Bump `de.thetaphi:forbiddenapis` from 3.5.1 to 3.6 ([#10508](https://github.com/opensearch-project/OpenSearch/pull/10508))
 - Bump `org.codehaus.woodstox:stax2-api` from 4.2.1 to 4.2.2 ([#10639](https://github.com/opensearch-project/OpenSearch/pull/10639))
 - Bump `org.bouncycastle:bc-fips` from 1.0.2.3 to 1.0.2.4 ([#10297](https://github.com/opensearch-project/OpenSearch/pull/10297))
 - Bump `com.google.http-client:google-http-client` from 1.43.2 to 1.43.3 ([#10635](https://github.com/opensearch-project/OpenSearch/pull/10635))
-- Bump `com.squareup.okio:okio` from 3.5.0 to 3.6.0 ([#10637](https://github.com/opensearch-project/OpenSearch/pull/10637))
-- Bump `org.apache.logging.log4j:log4j-core` from 2.20.0 to 2.22.0 ([#10858](https://github.com/opensearch-project/OpenSearch/pull/10858), [#11000](https://github.com/opensearch-project/OpenSearch/pull/11000), [#11270](https://github.com/opensearch-project/OpenSearch/pull/11270))
+- Bump `com.squareup.okio:okio` from 3.5.0 to 3.7.0 ([#10637](https://github.com/opensearch-project/OpenSearch/pull/10637), [#11632](https://github.com/opensearch-project/OpenSearch/pull/11632))
+- Bump `org.apache.logging.log4j:log4j-core` from 2.20.0 to 2.22.1 ([#10858](https://github.com/opensearch-project/OpenSearch/pull/10858), [#11000](https://github.com/opensearch-project/OpenSearch/pull/11000), [#11270](https://github.com/opensearch-project/OpenSearch/pull/11270), [#11695](https://github.com/opensearch-project/OpenSearch/pull/11695))
 - Bump `aws-actions/configure-aws-credentials` from 2 to 4 ([#10504](https://github.com/opensearch-project/OpenSearch/pull/10504))
 - 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 `com.avast.gradle:gradle-docker-compose-plugin` from 0.16.12 to 0.17.5 ([#10163](https://github.com/opensearch-project/OpenSearch/pull/10163))
+- 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))
 - Bump `reactor-netty-core` from 1.1.12 to 1.1.13 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350))
-- Bump `com.gradle.enterprise` from 3.14.1 to 3.15.1 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339))
+- Bump `com.gradle.enterprise` from 3.14.1 to 3.16.1 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629))
+- Bump `actions/setup-java` from 3 to 4 ([#11447](https://github.com/opensearch-project/OpenSearch/pull/11447))
+- Bump `commons-net:commons-net` from 3.9.0 to 3.10.0 ([#11450](https://github.com/opensearch-project/OpenSearch/pull/11450))
+- Bump `org.apache.maven:maven-model` from 3.9.4 to 3.9.6 ([#11445](https://github.com/opensearch-project/OpenSearch/pull/11445))
+- Bump `org.apache.xmlbeans:xmlbeans` from 5.1.1 to 5.2.0 ([#11448](https://github.com/opensearch-project/OpenSearch/pull/11448))
+- Bump `logback-core` and `logback-classic` to 1.2.13 ([#11521](https://github.com/opensearch-project/OpenSearch/pull/11521))
+- Bumps `jetty` version from 9.4.52.v20230823 to 9.4.53.v20231009 ([#11539](https://github.com/opensearch-project/OpenSearch/pull/11539))
+- Bump `org.wiremock:wiremock-standalone` from 3.1.0 to 3.3.1 ([#11555](https://github.com/opensearch-project/OpenSearch/pull/11555))
+- Bump `org.apache.commons:commons-compress` from 1.24.0 to 1.25.0 ([#11556](https://github.com/opensearch-project/OpenSearch/pull/11556))
+- Bump `actions/stale` from 8 to 9 ([#11557](https://github.com/opensearch-project/OpenSearch/pull/11557))
+- Bump `com.netflix.nebula:nebula-publishing-plugin` from 20.3.0 to 21.0.0 ([#11671](https://github.com/opensearch-project/OpenSearch/pull/11671))
+- Bump `commons-cli:commons-cli` from 1.5.0 to 1.6.0 ([#10996](https://github.com/opensearch-project/OpenSearch/pull/10996))
+- 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))
 
 ### 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))
+- 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))
 - [BUG] Fix java.lang.SecurityException in repository-gcs plugin ([#10642](https://github.com/opensearch-project/OpenSearch/pull/10642))
 - 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))
-- Refactor common parts from the Rounding class into a separate 'round' package ([#11023](https://github.com/opensearch-project/OpenSearch/issues/11023))
 - 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))
@@ -159,6 +180,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Improved performance of numeric exact-match queries ([#11209](https://github.com/opensearch-project/OpenSearch/pull/11209))
 - Improve boolean parsing performance ([#11308](https://github.com/opensearch-project/OpenSearch/pull/11308))
 - 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))
 
 ### Deprecated
 
@@ -171,13 +196,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - 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))
-- Fix SuggestSearch.testSkipDuplicates by forceing refresh when indexing its test documents ([#11068](https://github.com/opensearch-project/OpenSearch/pull/11068))
 - Delegating CachingWeightWrapper#count to internal weight object ([#10543](https://github.com/opensearch-project/OpenSearch/pull/10543))
 - Fix per request latency last phase not tracked ([#10934](https://github.com/opensearch-project/OpenSearch/pull/10934))
-- Fix for stuck update action in a bulk with `retry_on_conflict` property ([#11152](https://github.com/opensearch-project/OpenSearch/issues/11152))
+- Fix SuggestSearch.testSkipDuplicates by forcing refresh when indexing its test documents ([#11068](https://github.com/opensearch-project/OpenSearch/pull/11068))
+- [BUG] Fix the thread context that is not properly cleared and messes up the traces ([#10873](https://github.com/opensearch-project/OpenSearch/pull/10873))
+- Handle canMatchSearchAfter for frozen context scenario ([#11249](https://github.com/opensearch-project/OpenSearch/pull/11249))
+- 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 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))
+- Fix Automatic addition of protocol broken in #11512 ([#11609](https://github.com/opensearch-project/OpenSearch/pull/11609))
+- Fix issue when calling Delete PIT endpoint and no PITs exist ([#11711](https://github.com/opensearch-project/OpenSearch/pull/11711))
 
 ### Security
 
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 4d2e02646cc33..a42976fef572c 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -103,40 +103,36 @@ dependencies {
   api localGroovy()
 
   api 'commons-codec:commons-codec:1.16.0'
-  api 'org.apache.commons:commons-compress:1.24.0'
+  api 'org.apache.commons:commons-compress:1.25.0'
   api 'org.apache.ant:ant:1.10.14'
   api 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0'
-  api 'com.netflix.nebula:nebula-publishing-plugin:20.3.0'
+  api 'com.netflix.nebula:nebula-publishing-plugin:21.0.0'
   api 'com.netflix.nebula:gradle-info-plugin:12.1.6'
   api 'org.apache.rat:apache-rat:0.15'
-  api 'commons-io:commons-io:2.13.0'
+  api 'commons-io:commons-io:2.15.1'
   api "net.java.dev.jna:jna:5.13.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')}"
   api 'de.thetaphi:forbiddenapis:3.6'
-  api 'com.avast.gradle:gradle-docker-compose-plugin:0.17.5'
+  api 'com.avast.gradle:gradle-docker-compose-plugin:0.17.6'
   api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
-  api 'org.apache.maven:maven-model:3.9.4'
+  api 'org.apache.maven:maven-model:3.9.6'
   api 'com.networknt:json-schema-validator:1.0.86'
   api 'org.jruby.jcodings:jcodings:1.0.58'
   api 'org.jruby.joni:joni:2.2.1'
   api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"
-  api "org.ajoberstar.grgit:grgit-core:5.2.0"
+  api "org.ajoberstar.grgit:grgit-core:5.2.1"
 
   testFixturesApi "junit:junit:${props.getProperty('junit')}"
   testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
   testFixturesApi gradleApi()
   testFixturesApi gradleTestKit()
-  testImplementation 'org.wiremock:wiremock-standalone:3.1.0'
+  testImplementation 'org.wiremock:wiremock-standalone:3.3.1'
   testImplementation "org.mockito:mockito-core:${props.getProperty('mockito')}"
   integTestImplementation('org.spockframework:spock-core:2.3-groovy-3.0') {
     exclude module: "groovy"
   }
-  implementation('org.ajoberstar.grgit:grgit-core:5.2.0') {
-    exclude group: 'org.eclipse.jgit', module: 'org.eclipse.jgit'
-  }
-  implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
 }
 
 configurations.all {
diff --git a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle
index f24b61ef0d165..351b42e5bc921 100644
--- a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle
+++ b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-  implementation "org.apache.logging.log4j:log4j-core:2.22.0"
+  implementation "org.apache.logging.log4j:log4j-core:2.22.1"
 }
 
 ["0.0.1", "0.0.2"].forEach { v ->
diff --git a/client/rest/build.gradle b/client/rest/build.gradle
index ff3c322c5ccf7..f18df65dfddfa 100644
--- a/client/rest/build.gradle
+++ b/client/rest/build.gradle
@@ -34,8 +34,8 @@ apply plugin: 'opensearch.build'
 apply plugin: 'opensearch.publish'
 
 java {
-  targetCompatibility = JavaVersion.VERSION_11
-  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_1_8
+  sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
 base {
@@ -109,3 +109,10 @@ thirdPartyAudit.ignoreMissingClasses(
   'javax.servlet.ServletContextEvent',
   'javax.servlet.ServletContextListener'
 )
+
+tasks.withType(JavaCompile) {
+  // Suppressing '[options] target value 8 is obsolete and will be removed in a future release'
+  configure(options) {
+    options.compilerArgs << '-Xlint:-options'
+  }
+}
diff --git a/client/rest/src/main/java/org/opensearch/client/RestClient.java b/client/rest/src/main/java/org/opensearch/client/RestClient.java
index 7691c01daefea..15905add76c4f 100644
--- a/client/rest/src/main/java/org/opensearch/client/RestClient.java
+++ b/client/rest/src/main/java/org/opensearch/client/RestClient.java
@@ -1116,9 +1116,15 @@ public long getContentLength() {
                 if (chunkedEnabled.get()) {
                     return -1L;
                 } else {
-                    long size;
+                    long size = 0;
+                    final byte[] buf = new byte[8192];
+                    int nread = 0;
+
                     try (InputStream is = getContent()) {
-                        size = is.readAllBytes().length;
+                        // read to EOF which may read more or less than buffer size
+                        while ((nread = is.read(buf)) > 0) {
+                            size += nread;
+                        }
                     } catch (IOException ex) {
                         size = -1L;
                     }
diff --git a/client/rest/src/test/java/org/opensearch/client/nio/HeapBufferedAsyncEntityConsumerTests.java b/client/rest/src/test/java/org/opensearch/client/nio/HeapBufferedAsyncEntityConsumerTests.java
index 6a4b176edd011..fdfe49ca901c9 100644
--- a/client/rest/src/test/java/org/opensearch/client/nio/HeapBufferedAsyncEntityConsumerTests.java
+++ b/client/rest/src/test/java/org/opensearch/client/nio/HeapBufferedAsyncEntityConsumerTests.java
@@ -35,34 +35,34 @@ public void tearDown() {
     }
 
     public void testConsumerAllocatesBufferLimit() throws IOException {
-        consumer.consume(randomByteBufferOfLength(1000).flip());
+        consumer.consume((ByteBuffer) randomByteBufferOfLength(1000).flip());
         assertThat(consumer.getBuffer().capacity(), equalTo(1000));
     }
 
     public void testConsumerAllocatesEmptyBuffer() throws IOException {
-        consumer.consume(ByteBuffer.allocate(0).flip());
+        consumer.consume((ByteBuffer) ByteBuffer.allocate(0).flip());
         assertThat(consumer.getBuffer().capacity(), equalTo(0));
     }
 
     public void testConsumerExpandsBufferLimits() throws IOException {
-        consumer.consume(randomByteBufferOfLength(1000).flip());
-        consumer.consume(randomByteBufferOfLength(2000).flip());
-        consumer.consume(randomByteBufferOfLength(3000).flip());
+        consumer.consume((ByteBuffer) randomByteBufferOfLength(1000).flip());
+        consumer.consume((ByteBuffer) randomByteBufferOfLength(2000).flip());
+        consumer.consume((ByteBuffer) randomByteBufferOfLength(3000).flip());
         assertThat(consumer.getBuffer().capacity(), equalTo(6000));
     }
 
     public void testConsumerAllocatesLimit() throws IOException {
-        consumer.consume(randomByteBufferOfLength(BUFFER_LIMIT).flip());
+        consumer.consume((ByteBuffer) randomByteBufferOfLength(BUFFER_LIMIT).flip());
         assertThat(consumer.getBuffer().capacity(), equalTo(BUFFER_LIMIT));
     }
 
     public void testConsumerFailsToAllocateOverLimit() throws IOException {
-        assertThrows(ContentTooLongException.class, () -> consumer.consume(randomByteBufferOfLength(BUFFER_LIMIT + 1).flip()));
+        assertThrows(ContentTooLongException.class, () -> consumer.consume((ByteBuffer) randomByteBufferOfLength(BUFFER_LIMIT + 1).flip()));
     }
 
     public void testConsumerFailsToExpandOverLimit() throws IOException {
-        consumer.consume(randomByteBufferOfLength(BUFFER_LIMIT).flip());
-        assertThrows(ContentTooLongException.class, () -> consumer.consume(randomByteBufferOfLength(1).flip()));
+        consumer.consume((ByteBuffer) randomByteBufferOfLength(BUFFER_LIMIT).flip());
+        assertThrows(ContentTooLongException.class, () -> consumer.consume((ByteBuffer) randomByteBufferOfLength(1).flip()));
     }
 
     private static ByteBuffer randomByteBufferOfLength(int length) {
diff --git a/client/test/build.gradle b/client/test/build.gradle
index f81a009389681..b77865df6decf 100644
--- a/client/test/build.gradle
+++ b/client/test/build.gradle
@@ -30,8 +30,8 @@
 apply plugin: 'opensearch.build'
 
 java {
-  targetCompatibility = JavaVersion.VERSION_11
-  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_1_8
+  sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
 base {
@@ -69,3 +69,10 @@ dependenciesInfo.enabled = false
 //we aren't releasing this jar
 thirdPartyAudit.enabled = false
 test.enabled = false
+
+tasks.withType(JavaCompile) {
+  // Suppressing '[options] target value 8 is obsolete and will be removed in a future release'
+  configure(options) {
+    options.compilerArgs << '-Xlint:-options'
+  }
+}
diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
index cb05661dc74a4..ededa7bff34d8 100644
--- a/distribution/packages/build.gradle
+++ b/distribution/packages/build.gradle
@@ -63,7 +63,7 @@ import java.util.regex.Pattern
  */
 
 plugins {
-  id "com.netflix.nebula.ospackage-base" version "11.5.0"
+  id "com.netflix.nebula.ospackage-base" version "11.6.0"
 }
 
 void addProcessFilesTask(String type, boolean jdk) {
diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options
index 1a0abcbaf9c88..f0ac98faffda9 100644
--- a/distribution/src/config/jvm.options
+++ b/distribution/src/config/jvm.options
@@ -38,12 +38,12 @@
 8-10:-XX:+UseCMSInitiatingOccupancyOnly
 
 ## G1GC Configuration
-# NOTE: G1 GC is only supported on JDK version 10 or later
-# to use G1GC, uncomment the next two lines and update the version on the
-# following three lines to your version of the JDK
-# 10:-XX:-UseConcMarkSweepGC
-# 10:-XX:-UseCMSInitiatingOccupancyOnly
+# NOTE: G1GC is the default GC for all JDKs 11 and newer
 11-:-XX:+UseG1GC
+# See https://github.com/elastic/elasticsearch/pull/46169 for the history
+# behind these settings, but the tl;dr is that default values can lead
+# to situations where heap usage grows enough to trigger a circuit breaker
+# before GC kicks in.
 11-:-XX:G1ReservePercent=25
 11-:-XX:InitiatingHeapOccupancyPercent=30
 
diff --git a/libs/common/src/main/java/org/opensearch/common/Nullable.java b/libs/common/src/main/java/org/opensearch/common/Nullable.java
index c663ef863ed48..70db2a3755eba 100644
--- a/libs/common/src/main/java/org/opensearch/common/Nullable.java
+++ b/libs/common/src/main/java/org/opensearch/common/Nullable.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.common;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.meta.TypeQualifierNickname;
 
@@ -53,5 +55,6 @@
 @CheckForNull
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD })
+@PublicApi(since = "1.0.0")
 public @interface Nullable {
 }
diff --git a/libs/common/src/main/java/org/opensearch/common/SuppressForbidden.java b/libs/common/src/main/java/org/opensearch/common/SuppressForbidden.java
index 1f1b28bcf6759..c479d7bd98e8a 100644
--- a/libs/common/src/main/java/org/opensearch/common/SuppressForbidden.java
+++ b/libs/common/src/main/java/org/opensearch/common/SuppressForbidden.java
@@ -31,6 +31,8 @@
 
 package org.opensearch.common;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -43,6 +45,7 @@
  */
 @Retention(RetentionPolicy.CLASS)
 @Target({ ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.METHOD, ElementType.TYPE })
+@PublicApi(since = "1.0.0")
 public @interface SuppressForbidden {
     String reason();
 }
diff --git a/libs/common/src/main/java/org/opensearch/common/annotation/processor/ApiAnnotationProcessor.java b/libs/common/src/main/java/org/opensearch/common/annotation/processor/ApiAnnotationProcessor.java
new file mode 100644
index 0000000000000..1864aec4aa951
--- /dev/null
+++ b/libs/common/src/main/java/org/opensearch/common/annotation/processor/ApiAnnotationProcessor.java
@@ -0,0 +1,369 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.DeprecatedApi;
+import org.opensearch.common.annotation.ExperimentalApi;
+import org.opensearch.common.annotation.InternalApi;
+import org.opensearch.common.annotation.PublicApi;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.AnnotatedConstruct;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.TypeParameterElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ReferenceType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeVariable;
+import javax.lang.model.type.WildcardType;
+import javax.tools.Diagnostic.Kind;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * The annotation processor for API related annotations: {@link DeprecatedApi}, {@link ExperimentalApi},
+ * {@link InternalApi} and {@link PublicApi}.
+ * <p>
+ * The checks are built on top of the following rules:
+ * <ul>
+ *  <li>introspect each type annotated with {@link PublicApi}, {@link DeprecatedApi} or {@link ExperimentalApi},
+ *  filtering out package-private declarations</li>
+ *  <li>make sure those leak only {@link PublicApi}, {@link DeprecatedApi} or {@link ExperimentalApi} types as well (exceptions,
+ *    method return values, method arguments, method generic type arguments, class generic type arguments,  annotations)</li>
+ *  <li>recursively follow the type introspection chains to enforce the rules down the line</li>
+ * </ul>
+ */
+@InternalApi
+@SupportedAnnotationTypes("org.opensearch.common.annotation.*")
+public class ApiAnnotationProcessor extends AbstractProcessor {
+    private static final String OPTION_CONTINUE_ON_FAILING_CHECKS = "continueOnFailingChecks";
+    private static final String OPENSEARCH_PACKAGE = "org.opensearch";
+
+    private final Set<Element> reported = new HashSet<>();
+    private final Set<AnnotatedConstruct> processed = new HashSet<>();
+    private Kind reportFailureAs = Kind.ERROR;
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+        return SourceVersion.latest();
+    }
+
+    @Override
+    public Set<String> getSupportedOptions() {
+        return Set.of(OPTION_CONTINUE_ON_FAILING_CHECKS);
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment round) {
+        processingEnv.getMessager().printMessage(Kind.NOTE, "Processing OpenSearch Api annotations");
+
+        if (processingEnv.getOptions().containsKey(OPTION_CONTINUE_ON_FAILING_CHECKS) == true) {
+            reportFailureAs = Kind.NOTE;
+        }
+
+        final Set<? extends Element> elements = round.getElementsAnnotatedWithAny(
+            Set.of(PublicApi.class, ExperimentalApi.class, DeprecatedApi.class)
+        );
+
+        for (var element : elements) {
+            if (!checkPackage(element)) {
+                continue;
+            }
+
+            // Skip all not-public elements
+            checkPublicVisibility(null, element);
+
+            if (element instanceof TypeElement) {
+                process((TypeElement) element);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check top level executable element
+     * @param executable top level executable element
+     * @param enclosing enclosing element
+     */
+    private void process(ExecutableElement executable, Element enclosing) {
+        if (!inspectable(executable)) {
+            return;
+        }
+
+        // The executable element should not be internal (unless constructor for injectable core component)
+        checkNotInternal(enclosing, executable);
+
+        // Check this elements annotations
+        for (final AnnotationMirror annotation : executable.getAnnotationMirrors()) {
+            final Element element = annotation.getAnnotationType().asElement();
+            if (inspectable(element)) {
+                checkNotInternal(executable.getEnclosingElement(), element);
+                checkPublic(executable.getEnclosingElement(), element);
+            }
+        }
+
+        // Process method return types
+        final TypeMirror returnType = executable.getReturnType();
+        if (returnType instanceof ReferenceType) {
+            process(executable, (ReferenceType) returnType);
+        }
+
+        // Process method thrown types
+        for (final TypeMirror thrownType : executable.getThrownTypes()) {
+            if (thrownType instanceof ReferenceType) {
+                process(executable, (ReferenceType) thrownType);
+            }
+        }
+
+        // Process method type parameters
+        for (final TypeParameterElement typeParameter : executable.getTypeParameters()) {
+            for (final TypeMirror boundType : typeParameter.getBounds()) {
+                if (boundType instanceof ReferenceType) {
+                    process(executable, (ReferenceType) boundType);
+                }
+            }
+        }
+
+        // Process method arguments
+        for (final VariableElement parameter : executable.getParameters()) {
+            final TypeMirror parameterType = parameter.asType();
+            if (parameterType instanceof ReferenceType) {
+                process(executable, (ReferenceType) parameterType);
+            }
+        }
+    }
+
+    /**
+     * Check wildcard type bounds referred by an element
+     * @param executable element
+     * @param type wildcard type
+     */
+    private void process(ExecutableElement executable, WildcardType type) {
+        if (type.getExtendsBound() instanceof ReferenceType) {
+            process(executable, (ReferenceType) type.getExtendsBound());
+        }
+
+        if (type.getSuperBound() instanceof ReferenceType) {
+            process(executable, (ReferenceType) type.getSuperBound());
+        }
+    }
+
+    /**
+     * Check reference type bounds referred by an executable element
+     * @param executable executable element
+     * @param ref reference type
+     */
+    private void process(ExecutableElement executable, ReferenceType ref) {
+        // The element has been processed already
+        if (processed.add(ref) == false) {
+            return;
+        }
+
+        if (ref instanceof DeclaredType) {
+            final DeclaredType declaredType = (DeclaredType) ref;
+
+            final Element element = declaredType.asElement();
+            if (inspectable(element)) {
+                checkNotInternal(executable.getEnclosingElement(), element);
+                checkPublic(executable.getEnclosingElement(), element);
+            }
+
+            for (final TypeMirror type : declaredType.getTypeArguments()) {
+                if (type instanceof ReferenceType) {
+                    process(executable, (ReferenceType) type);
+                } else if (type instanceof WildcardType) {
+                    process(executable, (WildcardType) type);
+                }
+            }
+        } else if (ref instanceof ArrayType) {
+            final TypeMirror componentType = ((ArrayType) ref).getComponentType();
+            if (componentType instanceof ReferenceType) {
+                process(executable, (ReferenceType) componentType);
+            }
+        } else if (ref instanceof TypeVariable) {
+            final TypeVariable typeVariable = (TypeVariable) ref;
+            if (typeVariable.getUpperBound() instanceof ReferenceType) {
+                process(executable, (ReferenceType) typeVariable.getUpperBound());
+            }
+            if (typeVariable.getLowerBound() instanceof ReferenceType) {
+                process(executable, (ReferenceType) typeVariable.getLowerBound());
+            }
+        }
+
+        // Check this elements annotations
+        for (final AnnotationMirror annotation : ref.getAnnotationMirrors()) {
+            final Element element = annotation.getAnnotationType().asElement();
+            if (inspectable(element)) {
+                checkNotInternal(executable.getEnclosingElement(), element);
+                checkPublic(executable.getEnclosingElement(), element);
+            }
+        }
+    }
+
+    /**
+     * Check if a particular executable element should be inspected or not
+     * @param executable executable element to inspect
+     * @return {@code true} if a particular executable element should be inspected, {@code false} otherwise
+     */
+    private boolean inspectable(ExecutableElement executable) {
+        // The constructors for public APIs could use non-public APIs when those are supposed to be only
+        // consumed (not instantiated) by external consumers.
+        return executable.getKind() != ElementKind.CONSTRUCTOR && executable.getModifiers().contains(Modifier.PUBLIC);
+    }
+
+    /**
+     * Check if a particular element should be inspected or not
+     * @param element element to inspect
+     * @return {@code true} if a particular element should be inspected, {@code false} otherwise
+     */
+    private boolean inspectable(Element element) {
+        final PackageElement pckg = processingEnv.getElementUtils().getPackageOf(element);
+        return pckg.getQualifiedName().toString().startsWith(OPENSEARCH_PACKAGE);
+    }
+
+    /**
+     * Check if a particular element belongs to OpenSeach managed packages
+     * @param element element to inspect
+     * @return {@code true} if a particular element belongs to OpenSeach managed packages, {@code false} otherwise
+     */
+    private boolean checkPackage(Element element) {
+        // The element was reported already
+        if (reported.contains(element)) {
+            return false;
+        }
+
+        final PackageElement pckg = processingEnv.getElementUtils().getPackageOf(element);
+        final boolean belongsToOpenSearch = pckg.getQualifiedName().toString().startsWith(OPENSEARCH_PACKAGE);
+
+        if (!belongsToOpenSearch) {
+            reported.add(element);
+
+            processingEnv.getMessager()
+                .printMessage(
+                    reportFailureAs,
+                    "The type "
+                        + element
+                        + " is not residing in "
+                        + OPENSEARCH_PACKAGE
+                        + ".* package "
+                        + "and should not be annotated as OpenSearch APIs."
+                );
+        }
+
+        return belongsToOpenSearch;
+    }
+
+    /**
+     * Check the fields, methods, constructors, and member types that are directly
+     * declared in this class or interface.
+     * @param element class or interface
+     */
+    private void process(Element element) {
+        // Check the fields, methods, constructors, and member types that are directly
+        // declared in this class or interface.
+        for (final Element enclosed : element.getEnclosedElements()) {
+            // Skip all not-public elements
+            if (!enclosed.getModifiers().contains(Modifier.PUBLIC)) {
+                continue;
+            }
+
+            if (enclosed instanceof ExecutableElement) {
+                process((ExecutableElement) enclosed, element);
+            }
+        }
+    }
+
+    /**
+     * Check if element is public and annotated with {@link PublicApi}, {@link DeprecatedApi} or {@link ExperimentalApi}
+     * @param referencedBy the referrer for the element
+     * @param element element to check
+     */
+    private void checkPublic(@Nullable Element referencedBy, final Element element) {
+        // The element was reported already
+        if (reported.contains(element)) {
+            return;
+        }
+
+        checkPublicVisibility(referencedBy, element);
+
+        if (element.getAnnotation(PublicApi.class) == null
+            && element.getAnnotation(ExperimentalApi.class) == null
+            && element.getAnnotation(DeprecatedApi.class) == null) {
+            reported.add(element);
+
+            processingEnv.getMessager()
+                .printMessage(
+                    reportFailureAs,
+                    "The element "
+                        + element
+                        + " is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi"
+                        + ((referencedBy != null) ? " (referenced by " + referencedBy + ") " : "")
+                );
+        }
+    }
+
+    /**
+     * Check if element has public visibility (following Java visibility rules)
+     * @param referencedBy the referrer for the element
+     * @param element element to check
+     */
+    private void checkPublicVisibility(Element referencedBy, final Element element) {
+        if (!element.getModifiers().contains(Modifier.PUBLIC) && !element.getModifiers().contains(Modifier.PROTECTED)) {
+            reported.add(element);
+
+            processingEnv.getMessager()
+                .printMessage(
+                    reportFailureAs,
+                    "The element "
+                        + element
+                        + " is part of the public APIs but does not have public or protected visibility"
+                        + ((referencedBy != null) ? " (referenced by " + referencedBy + ") " : "")
+                );
+        }
+    }
+
+    /**
+     * Check if element is not annotated with {@link InternalApi}
+     * @param referencedBy the referrer for the element
+     * @param element element to check
+     */
+    private void checkNotInternal(@Nullable Element referencedBy, final Element element) {
+        // The element was reported already
+        if (reported.contains(element)) {
+            return;
+        }
+
+        if (element.getAnnotation(InternalApi.class) != null) {
+            reported.add(element);
+
+            processingEnv.getMessager()
+                .printMessage(
+                    reportFailureAs,
+                    "The element "
+                        + element
+                        + " is part of the public APIs but is marked as @InternalApi"
+                        + ((referencedBy != null) ? " (referenced by " + referencedBy + ") " : "")
+                );
+        }
+    }
+}
diff --git a/libs/common/src/main/java/org/opensearch/common/annotation/processor/package-info.java b/libs/common/src/main/java/org/opensearch/common/annotation/processor/package-info.java
new file mode 100644
index 0000000000000..fa23e4a7addce
--- /dev/null
+++ b/libs/common/src/main/java/org/opensearch/common/annotation/processor/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * 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.
+ */
+
+/**
+ * Classes related yo OpenSearch API annotation processing
+ *
+ * @opensearch.internal
+ */
+@org.opensearch.common.annotation.InternalApi
+package org.opensearch.common.annotation.processor;
diff --git a/libs/common/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/libs/common/src/main/resources/META-INF/services/javax.annotation.processing.Processor
new file mode 100644
index 0000000000000..c4e4dfed864f2
--- /dev/null
+++ b/libs/common/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1,12 @@
+#
+# 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.
+#
+# Modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.
+#
+
+org.opensearch.common.annotation.processor.ApiAnnotationProcessor
\ No newline at end of file
diff --git a/libs/common/src/test/java/org/opensearch/common/annotation/processor/ApiAnnotationProcessorTests.java b/libs/common/src/test/java/org/opensearch/common/annotation/processor/ApiAnnotationProcessorTests.java
new file mode 100644
index 0000000000000..df04709458b29
--- /dev/null
+++ b/libs/common/src/test/java/org/opensearch/common/annotation/processor/ApiAnnotationProcessorTests.java
@@ -0,0 +1,476 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.InternalApi;
+import org.opensearch.test.OpenSearchTestCase;
+
+import javax.tools.Diagnostic;
+
+import static org.opensearch.common.annotation.processor.CompilerSupport.HasDiagnostic.matching;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+
+@SuppressWarnings("deprecation")
+public class ApiAnnotationProcessorTests extends OpenSearchTestCase implements CompilerSupport {
+    public void testPublicApiMethodArgumentNotAnnotated() {
+        final CompilerResult result = compile("PublicApiMethodArgumentNotAnnotated.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotated is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodArgumentNotAnnotated)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodArgumentNotAnnotatedGenerics() {
+        final CompilerResult result = compile("PublicApiMethodArgumentNotAnnotatedGenerics.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotated is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodArgumentNotAnnotatedGenerics)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodThrowsNotAnnotated() {
+        final CompilerResult result = compile("PublicApiMethodThrowsNotAnnotated.java", "PublicApiAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotatedException is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodThrowsNotAnnotated)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodArgumentNotAnnotatedPackagePrivate() {
+        final CompilerResult result = compile("PublicApiMethodArgumentNotAnnotatedPackagePrivate.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(4));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotatedPackagePrivate is part of the public APIs but does not have public or protected visibility "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodArgumentNotAnnotatedPackagePrivate)"
+                    )
+                )
+            )
+        );
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotatedPackagePrivate is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodArgumentNotAnnotatedPackagePrivate)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodArgumentAnnotatedPackagePrivate() {
+        final CompilerResult result = compile("PublicApiMethodArgumentAnnotatedPackagePrivate.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.AnnotatedPackagePrivate is part of the public APIs but does not have public or protected visibility "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodArgumentAnnotatedPackagePrivate)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiWithInternalApiMethod() {
+        final CompilerResult result = compile("PublicApiWithInternalApiMethod.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element method() is part of the public APIs but is marked as @InternalApi (referenced by org.opensearch.common.annotation.processor.PublicApiWithInternalApiMethod)"
+                    )
+                )
+            )
+        );
+    }
+
+    /**
+     * The constructor arguments have relaxed semantics at the moment: those could be not annotated or be annotated as {@link InternalApi}
+     */
+    public void testPublicApiConstructorArgumentNotAnnotated() {
+        final CompilerResult result = compile("PublicApiConstructorArgumentNotAnnotated.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    /**
+     * The constructor arguments have relaxed semantics at the moment: those could be not annotated or be annotated as {@link InternalApi}
+     */
+    public void testPublicApiConstructorArgumentAnnotatedInternalApi() {
+        final CompilerResult result = compile("PublicApiConstructorArgumentAnnotatedInternalApi.java", "InternalApiAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testPublicApiWithExperimentalApiMethod() {
+        final CompilerResult result = compile("PublicApiWithExperimentalApiMethod.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testPublicApiMethodReturnNotAnnotated() {
+        final CompilerResult result = compile("PublicApiMethodReturnNotAnnotated.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotated is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodReturnNotAnnotated)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodReturnNotAnnotatedGenerics() {
+        final CompilerResult result = compile("PublicApiMethodReturnNotAnnotatedGenerics.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotated is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodReturnNotAnnotatedGenerics)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodReturnNotAnnotatedArray() {
+        final CompilerResult result = compile("PublicApiMethodReturnNotAnnotatedArray.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotated is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodReturnNotAnnotatedArray)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodReturnNotAnnotatedBoundedGenerics() {
+        final CompilerResult result = compile("PublicApiMethodReturnNotAnnotatedBoundedGenerics.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotated is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodReturnNotAnnotatedBoundedGenerics)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodReturnNotAnnotatedAnnotation() {
+        final CompilerResult result = compile(
+            "PublicApiMethodReturnNotAnnotatedAnnotation.java",
+            "PublicApiAnnotated.java",
+            "NotAnnotatedAnnotation.java"
+        );
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotatedAnnotation is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodReturnNotAnnotatedAnnotation)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodReturnNotAnnotatedWildcardGenerics() {
+        final CompilerResult result = compile("PublicApiMethodReturnNotAnnotatedWildcardGenerics.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testPublicApiWithPackagePrivateMethod() {
+        final CompilerResult result = compile("PublicApiWithPackagePrivateMethod.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testPublicApiMethodReturnSelf() {
+        final CompilerResult result = compile("PublicApiMethodReturnSelf.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testExperimentalApiMethodReturnSelf() {
+        final CompilerResult result = compile("ExperimentalApiMethodReturnSelf.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testDeprecatedApiMethodReturnSelf() {
+        final CompilerResult result = compile("DeprecatedApiMethodReturnSelf.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testPublicApiPackagePrivate() {
+        final CompilerResult result = compile("PublicApiPackagePrivate.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.PublicApiPackagePrivate is part of the public APIs but does not have public or protected visibility"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodGenericsArgumentNotAnnotated() {
+        final CompilerResult result = compile("PublicApiMethodGenericsArgumentNotAnnotated.java", "NotAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotated is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodGenericsArgumentNotAnnotated)"
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodReturnAnnotatedArray() {
+        final CompilerResult result = compile("PublicApiMethodReturnAnnotatedArray.java", "PublicApiAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testPublicApiMethodGenericsArgumentAnnotated() {
+        final CompilerResult result = compile("PublicApiMethodGenericsArgumentAnnotated.java", "PublicApiAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+
+    public void testPublicApiAnnotatedNotOpensearch() {
+        final CompilerResult result = compileWithPackage("org.acme", "PublicApiAnnotated.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The type org.acme.PublicApiAnnotated is not residing in org.opensearch.* package and should not be annotated as OpenSearch APIs."
+                    )
+                )
+            )
+        );
+    }
+
+    public void testPublicApiMethodReturnAnnotatedGenerics() {
+        final CompilerResult result = compile(
+            "PublicApiMethodReturnAnnotatedGenerics.java",
+            "PublicApiAnnotated.java",
+            "NotAnnotatedAnnotation.java"
+        );
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(3));
+
+        assertThat(
+            failure.diagnotics(),
+            hasItem(
+                matching(
+                    Diagnostic.Kind.ERROR,
+                    containsString(
+                        "The element org.opensearch.common.annotation.processor.NotAnnotatedAnnotation is part of the public APIs but is not maked as @PublicApi, @ExperimentalApi or @DeprecatedApi "
+                            + "(referenced by org.opensearch.common.annotation.processor.PublicApiMethodReturnAnnotatedGenerics)"
+                    )
+                )
+            )
+        );
+    }
+
+    /**
+     * The type could expose protected inner types which are still considered to be a public API when used
+     */
+    public void testPublicApiWithProtectedInterface() {
+        final CompilerResult result = compile("PublicApiWithProtectedInterface.java");
+        assertThat(result, instanceOf(Failure.class));
+
+        final Failure failure = (Failure) result;
+        assertThat(failure.diagnotics(), hasSize(2));
+
+        assertThat(failure.diagnotics(), not(hasItem(matching(Diagnostic.Kind.ERROR))));
+    }
+}
diff --git a/libs/common/src/test/java/org/opensearch/common/annotation/processor/CompilerSupport.java b/libs/common/src/test/java/org/opensearch/common/annotation/processor/CompilerSupport.java
new file mode 100644
index 0000000000000..dcf8dd7945012
--- /dev/null
+++ b/libs/common/src/test/java/org/opensearch/common/annotation/processor/CompilerSupport.java
@@ -0,0 +1,139 @@
+/*
+ * 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.annotation.processor;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+interface CompilerSupport {
+    default CompilerResult compile(String name, String... names) {
+        return compileWithPackage(ApiAnnotationProcessorTests.class.getPackageName(), name, names);
+    }
+
+    default CompilerResult compileWithPackage(String pck, String name, String... names) {
+        final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+        final DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();
+
+        try (StringWriter out = new StringWriter()) {
+            final StandardJavaFileManager fileManager = compiler.getStandardFileManager(collector, null, null);
+            final List<JavaFileObject> files = Stream.concat(Stream.of(name), Arrays.stream(names))
+                .map(f -> asSource(pck, f))
+                .collect(Collectors.toList());
+
+            final CompilationTask task = compiler.getTask(out, fileManager, collector, null, null, files);
+            task.setProcessors(Collections.singleton(new ApiAnnotationProcessor()));
+
+            if (AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> task.call())) {
+                return new Success();
+            } else {
+                return new Failure(collector.getDiagnostics());
+            }
+        } catch (final IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    private static JavaFileObject asSource(String pkg, String name) {
+        final String resource = "/" + pkg.replaceAll("[.]", "/") + "/" + name;
+        final URL source = ApiAnnotationProcessorTests.class.getResource(resource);
+
+        return new SimpleJavaFileObject(URI.create(source.toExternalForm()), Kind.SOURCE) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                try (final InputStream in = ApiAnnotationProcessorTests.class.getResourceAsStream(resource)) {
+                    return new String(in.readAllBytes(), StandardCharsets.UTF_8);
+                }
+            }
+        };
+    }
+
+    class CompilerResult {}
+
+    class Success extends CompilerResult {
+
+    }
+
+    class Failure extends CompilerResult {
+        private final List<Diagnostic<? extends JavaFileObject>> diagnotics;
+
+        Failure(List<Diagnostic<? extends JavaFileObject>> diagnotics) {
+            this.diagnotics = diagnotics;
+        }
+
+        List<Diagnostic<? extends JavaFileObject>> diagnotics() {
+            return diagnotics;
+        }
+    }
+
+    class HasDiagnostic extends TypeSafeMatcher<Diagnostic<? extends JavaFileObject>> {
+        private final Diagnostic.Kind kind;
+        private final Matcher<String> matcher;
+
+        HasDiagnostic(final Diagnostic.Kind kind, final Matcher<String> matcher) {
+            this.kind = kind;
+            this.matcher = matcher;
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText("diagnostic with kind ").appendValue(kind).appendText(" ");
+
+            if (matcher != null) {
+                description.appendText(" and message ");
+                matcher.describeTo(description);
+            }
+        }
+
+        @Override
+        protected boolean matchesSafely(Diagnostic<? extends JavaFileObject> item) {
+            if (!kind.equals(item.getKind())) {
+                return false;
+            } else if (matcher != null) {
+                return matcher.matches(item.getMessage(Locale.ROOT));
+            } else {
+                return true;
+            }
+        }
+
+        public static HasDiagnostic matching(final Diagnostic.Kind kind, final Matcher<String> matcher) {
+            return new HasDiagnostic(kind, matcher);
+        }
+
+        public static HasDiagnostic matching(final Diagnostic.Kind kind) {
+            return new HasDiagnostic(kind, null);
+        }
+    }
+}
diff --git a/libs/common/src/test/resources/org/acme/PublicApiAnnotated.java b/libs/common/src/test/resources/org/acme/PublicApiAnnotated.java
new file mode 100644
index 0000000000000..bc16fd996e69d
--- /dev/null
+++ b/libs/common/src/test/resources/org/acme/PublicApiAnnotated.java
@@ -0,0 +1,16 @@
+/*
+ * 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.acme;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiAnnotated {
+
+}
diff --git a/libs/common/src/test/resources/org/opensearch/bootstrap/test.policy b/libs/common/src/test/resources/org/opensearch/bootstrap/test.policy
new file mode 100644
index 0000000000000..e0a183b7eac88
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/bootstrap/test.policy
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+
+grant {
+  // allow to use JVM tooling (Java Compiler) in tests for annotation processing 
+  permission java.io.FilePermission "${java.home}/lib/*", "read";
+  permission java.io.FilePermission "${java.home}/lib/modules/*", "read";
+  permission java.lang.RuntimePermission "accessSystemModules";
+  permission java.lang.RuntimePermission "accessDeclaredMembers";
+  permission java.lang.RuntimePermission "accessClassInPackage.*";
+};
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/DeprecatedApiMethodReturnSelf.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/DeprecatedApiMethodReturnSelf.java
new file mode 100644
index 0000000000000..7c5b6f6ea2f51
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/DeprecatedApiMethodReturnSelf.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.DeprecatedApi;
+
+@DeprecatedApi(since = "1.0.0")
+public class DeprecatedApiMethodReturnSelf {
+    public DeprecatedApiMethodReturnSelf method() {
+        return new DeprecatedApiMethodReturnSelf();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/ExperimentalApiAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/ExperimentalApiAnnotated.java
new file mode 100644
index 0000000000000..5be07e22c811f
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/ExperimentalApiAnnotated.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.ExperimentalApi;
+
+@ExperimentalApi
+public class ExperimentalApiAnnotated {
+
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/ExperimentalApiMethodReturnSelf.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/ExperimentalApiMethodReturnSelf.java
new file mode 100644
index 0000000000000..cde8f4f254faf
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/ExperimentalApiMethodReturnSelf.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.ExperimentalApi;
+
+@ExperimentalApi
+public class ExperimentalApiMethodReturnSelf {
+    public ExperimentalApiMethodReturnSelf method() {
+        return new ExperimentalApiMethodReturnSelf();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/InternalApiAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/InternalApiAnnotated.java
new file mode 100644
index 0000000000000..9996ba8b736aa
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/InternalApiAnnotated.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class InternalApiAnnotated {
+
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotated.java
new file mode 100644
index 0000000000000..ec16ce926ea86
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotated.java
@@ -0,0 +1,13 @@
+/*
+ * 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.annotation.processor;
+
+public class NotAnnotated {
+
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotatedAnnotation.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotatedAnnotation.java
new file mode 100644
index 0000000000000..a3e9c4f576d92
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotatedAnnotation.java
@@ -0,0 +1,27 @@
+/*
+ * 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.annotation.processor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({
+    ElementType.TYPE,
+    ElementType.TYPE_PARAMETER,
+    ElementType.TYPE_USE,
+    ElementType.PACKAGE,
+    ElementType.METHOD,
+    ElementType.CONSTRUCTOR,
+    ElementType.PARAMETER,
+    ElementType.FIELD,
+    ElementType.ANNOTATION_TYPE,
+    ElementType.MODULE })
+public @interface NotAnnotatedAnnotation {
+
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotatedException.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotatedException.java
new file mode 100644
index 0000000000000..0aadaf8f9bf31
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/NotAnnotatedException.java
@@ -0,0 +1,13 @@
+/*
+ * 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.annotation.processor;
+
+public class NotAnnotatedException extends Exception {
+    private static final long serialVersionUID = 1L;
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiAnnotated.java
new file mode 100644
index 0000000000000..b2a7f03cb2d31
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiAnnotated.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiAnnotated {
+
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiConstructorArgumentAnnotatedInternalApi.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiConstructorArgumentAnnotatedInternalApi.java
new file mode 100644
index 0000000000000..6bea2961a14e6
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiConstructorArgumentAnnotatedInternalApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.InternalApi;
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiConstructorArgumentAnnotatedInternalApi {
+    /**
+     * The constructor arguments have relaxed semantics at the moment: those could be not annotated or be annotated as {@link InternalApi}
+     */
+    public PublicApiConstructorArgumentAnnotatedInternalApi(InternalApiAnnotated arg) {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiConstructorArgumentNotAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiConstructorArgumentNotAnnotated.java
new file mode 100644
index 0000000000000..6c7481d9978cd
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiConstructorArgumentNotAnnotated.java
@@ -0,0 +1,20 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.InternalApi;
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiConstructorArgumentNotAnnotated {
+    /**
+     * The constructor arguments have relaxed semantics at the moment: those could be not annotated or be annotated as {@link InternalApi}
+     */
+    public PublicApiConstructorArgumentNotAnnotated(NotAnnotated arg) {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentAnnotatedPackagePrivate.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentAnnotatedPackagePrivate.java
new file mode 100644
index 0000000000000..5dae56a7cd7d3
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentAnnotatedPackagePrivate.java
@@ -0,0 +1,20 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodArgumentAnnotatedPackagePrivate {
+    public void method(AnnotatedPackagePrivate arg) {}
+}
+
+// The public API exposes this class through public method argument, it should be public
+@PublicApi(since = "1.0.0")
+class AnnotatedPackagePrivate {}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotated.java
new file mode 100644
index 0000000000000..ddfec939f79e8
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotated.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodArgumentNotAnnotated {
+    public void method(NotAnnotated arg) {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotatedGenerics.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotatedGenerics.java
new file mode 100644
index 0000000000000..d32502831d299
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotatedGenerics.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+import java.util.Collection;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodArgumentNotAnnotatedGenerics {
+    public void method(Collection<? super NotAnnotated> arg) {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotatedPackagePrivate.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotatedPackagePrivate.java
new file mode 100644
index 0000000000000..d4fb31b172ef2
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodArgumentNotAnnotatedPackagePrivate.java
@@ -0,0 +1,19 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodArgumentNotAnnotatedPackagePrivate {
+    public void method(NotAnnotatedPackagePrivate arg) {}
+}
+
+// The public API exposes this class through public method argument, it should be annotated and be public
+class NotAnnotatedPackagePrivate {}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodGenericsArgumentAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodGenericsArgumentAnnotated.java
new file mode 100644
index 0000000000000..9715748cfa659
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodGenericsArgumentAnnotated.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodGenericsArgumentAnnotated {
+    public <T extends PublicApiAnnotated> void method(T arg) {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodGenericsArgumentNotAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodGenericsArgumentNotAnnotated.java
new file mode 100644
index 0000000000000..f149c1f34b067
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodGenericsArgumentNotAnnotated.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodGenericsArgumentNotAnnotated {
+    public <T extends NotAnnotated> void method(T arg) {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnAnnotatedArray.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnAnnotatedArray.java
new file mode 100644
index 0000000000000..39b7e146fe1e7
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnAnnotatedArray.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnAnnotatedArray {
+    public PublicApiAnnotated[] method() {
+        return new PublicApiAnnotated[0];
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnAnnotatedGenerics.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnAnnotatedGenerics.java
new file mode 100644
index 0000000000000..2171eccee2f31
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnAnnotatedGenerics.java
@@ -0,0 +1,23 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.acme.PublicApiAnnotated;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnAnnotatedGenerics {
+    public Collection<@NotAnnotatedAnnotation PublicApiAnnotated> method() {
+        return Collections.emptyList();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotated.java
new file mode 100644
index 0000000000000..725d06072d0ea
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotated.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnNotAnnotated {
+    public NotAnnotated method() {
+        return new NotAnnotated();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedAnnotation.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedAnnotation.java
new file mode 100644
index 0000000000000..b684e36a53da1
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedAnnotation.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnNotAnnotatedAnnotation {
+    public @NotAnnotatedAnnotation PublicApiAnnotated method() {
+        return new PublicApiAnnotated();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedArray.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedArray.java
new file mode 100644
index 0000000000000..e4c541dcea57f
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedArray.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnNotAnnotatedArray {
+    public NotAnnotated[] method() {
+        return new NotAnnotated[0];
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedBoundedGenerics.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedBoundedGenerics.java
new file mode 100644
index 0000000000000..0646faf152610
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedBoundedGenerics.java
@@ -0,0 +1,21 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+import java.util.Collection;
+import java.util.Collections;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnNotAnnotatedBoundedGenerics {
+    public Collection<? extends NotAnnotated> method() {
+        return Collections.emptyList();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedGenerics.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedGenerics.java
new file mode 100644
index 0000000000000..2227883c707d0
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedGenerics.java
@@ -0,0 +1,21 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+import java.util.Collection;
+import java.util.Collections;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnNotAnnotatedGenerics {
+    public Collection<NotAnnotated> method() {
+        return Collections.emptyList();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedWildcardGenerics.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedWildcardGenerics.java
new file mode 100644
index 0000000000000..f2818ebb23c4a
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnNotAnnotatedWildcardGenerics.java
@@ -0,0 +1,21 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+import java.util.Collection;
+import java.util.Collections;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnNotAnnotatedWildcardGenerics {
+    public Collection<?> method() {
+        return Collections.emptyList();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnSelf.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnSelf.java
new file mode 100644
index 0000000000000..883471b23ae0f
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodReturnSelf.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodReturnSelf {
+    public PublicApiMethodReturnSelf method() {
+        return new PublicApiMethodReturnSelf();
+    }
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodThrowsNotAnnotated.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodThrowsNotAnnotated.java
new file mode 100644
index 0000000000000..496b243276565
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiMethodThrowsNotAnnotated.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiMethodThrowsNotAnnotated {
+    public void method(PublicApiAnnotated arg) throws NotAnnotatedException {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiPackagePrivate.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiPackagePrivate.java
new file mode 100644
index 0000000000000..88c20e7f4c8f1
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiPackagePrivate.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+class PublicApiPackagePrivate {
+    void method() {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithExperimentalApiMethod.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithExperimentalApiMethod.java
new file mode 100644
index 0000000000000..faaaa1d9f4051
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithExperimentalApiMethod.java
@@ -0,0 +1,18 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.ExperimentalApi;
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiWithExperimentalApiMethod {
+    @ExperimentalApi
+    public void method() {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithInternalApiMethod.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithInternalApiMethod.java
new file mode 100644
index 0000000000000..5bfa3c9f3e008
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithInternalApiMethod.java
@@ -0,0 +1,19 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.InternalApi;
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiWithInternalApiMethod {
+    // The public API exposes internal API method, it should be public API
+    @InternalApi
+    public void method() {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithPackagePrivateMethod.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithPackagePrivateMethod.java
new file mode 100644
index 0000000000000..1345467423530
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithPackagePrivateMethod.java
@@ -0,0 +1,16 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiWithPackagePrivateMethod {
+    void method(NotAnnotated arg) {}
+}
diff --git a/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithProtectedInterface.java b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithProtectedInterface.java
new file mode 100644
index 0000000000000..222ae01fd15e6
--- /dev/null
+++ b/libs/common/src/test/resources/org/opensearch/common/annotation/processor/PublicApiWithProtectedInterface.java
@@ -0,0 +1,22 @@
+/*
+ * 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.annotation.processor;
+
+import org.opensearch.common.annotation.PublicApi;
+
+@PublicApi(since = "1.0.0")
+public class PublicApiWithProtectedInterface {
+    public void method(ProtectedInterface iface) {}
+
+    /**
+     * The type could expose protected inner types which are still considered to be a public API when used
+     */
+    @PublicApi(since = "1.0.0")
+    protected interface ProtectedInterface {}
+}
diff --git a/libs/core/build.gradle b/libs/core/build.gradle
index 4850b5aea5c85..0cf2cd0bf92b6 100644
--- a/libs/core/build.gradle
+++ b/libs/core/build.gradle
@@ -36,45 +36,6 @@ base {
   archivesName = 'opensearch-core'
 }
 
-// we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 11 so we do not include this source set in our IDEs
-if (!isEclipse) {
-  sourceSets {
-    java11 {
-      java {
-        srcDirs = ['src/main/java11']
-      }
-    }
-  }
-
-  configurations {
-    java11Compile.extendsFrom(compile)
-  }
-
-  dependencies {
-    java11Implementation sourceSets.main.output
-  }
-
-  compileJava11Java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-  }
-
-  forbiddenApisJava11 {
-    if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {
-      targetCompatibility = JavaVersion.VERSION_11
-    }
-    replaceSignatureFiles 'jdk-signatures'
-  }
-
-  jar {
-    metaInf {
-      into 'versions/11'
-      from sourceSets.java11.output
-    }
-    manifest.attributes('Multi-Release': 'true')
-  }
-}
-
 dependencies {
   api project(':libs:opensearch-common')
 
diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
index 8d9ee73a02c1d..d94be3f25b53d 100644
--- a/libs/core/src/main/java/org/opensearch/Version.java
+++ b/libs/core/src/main/java/org/opensearch/Version.java
@@ -97,6 +97,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_10_1 = new Version(2100199, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_11_0 = new Version(2110099, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_11_1 = new Version(2110199, org.apache.lucene.util.Version.LUCENE_9_7_0);
+    public static final Version V_2_11_2 = new Version(2110299, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_12_0 = new Version(2120099, org.apache.lucene.util.Version.LUCENE_9_8_0);
     public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_8_0);
     public static final Version CURRENT = V_3_0_0;
diff --git a/libs/core/src/main/java/org/opensearch/core/common/bytes/AbstractBytesReference.java b/libs/core/src/main/java/org/opensearch/core/common/bytes/AbstractBytesReference.java
index 8c1efcd00c24e..a2bf7e499dee8 100644
--- a/libs/core/src/main/java/org/opensearch/core/common/bytes/AbstractBytesReference.java
+++ b/libs/core/src/main/java/org/opensearch/core/common/bytes/AbstractBytesReference.java
@@ -53,11 +53,6 @@ public abstract class AbstractBytesReference implements BytesReference {
     private Integer hash = null;
     private static final int MAX_UTF16_LENGTH = Integer.MAX_VALUE >> 1;
 
-    @Override
-    public int getInt(int index) {
-        return (get(index) & 0xFF) << 24 | (get(index + 1) & 0xFF) << 16 | (get(index + 2) & 0xFF) << 8 | get(index + 3) & 0xFF;
-    }
-
     @Override
     public int indexOf(byte marker, int from) {
         final int to = length();
diff --git a/libs/core/src/main/java/org/opensearch/core/common/bytes/BytesArray.java b/libs/core/src/main/java/org/opensearch/core/common/bytes/BytesArray.java
index ae04ddcc19eee..d7a8414935143 100644
--- a/libs/core/src/main/java/org/opensearch/core/common/bytes/BytesArray.java
+++ b/libs/core/src/main/java/org/opensearch/core/common/bytes/BytesArray.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.core.common.bytes;
 
+import org.apache.lucene.util.BitUtil;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.core.common.io.stream.StreamInput;
 
@@ -83,6 +84,11 @@ public byte get(int index) {
         return bytes[offset + index];
     }
 
+    @Override
+    public int getInt(int index) {
+        return (int) BitUtil.VH_BE_INT.get(bytes, offset + index);
+    }
+
     @Override
     public int length() {
         return length;
diff --git a/libs/core/src/main/java/org/opensearch/core/common/bytes/BytesReference.java b/libs/core/src/main/java/org/opensearch/core/common/bytes/BytesReference.java
index 9d24d3653397b..8cb65c9feb1ca 100644
--- a/libs/core/src/main/java/org/opensearch/core/common/bytes/BytesReference.java
+++ b/libs/core/src/main/java/org/opensearch/core/common/bytes/BytesReference.java
@@ -153,9 +153,11 @@ static BytesReference fromByteArray(ByteArray byteArray, int length) {
     byte get(int index);
 
     /**
-     * Returns the integer read from the 4 bytes (BE) starting at the given index.
+     * Returns the integer read from the 4 bytes (big endian) starting at the given index.
      */
-    int getInt(int index);
+    default int getInt(int index) {
+        return ((get(index) & 0xFF) << 24) | ((get(index + 1) & 0xFF) << 16) | ((get(index + 2) & 0xFF) << 8) | (get(index + 3) & 0xFF);
+    }
 
     /**
      * Finds the index of the first occurrence of the given marker between within the given bounds.
diff --git a/libs/core/src/main/java/org/opensearch/core/common/io/stream/BytesStreamInput.java b/libs/core/src/main/java/org/opensearch/core/common/io/stream/BytesStreamInput.java
index 30c84708728ef..cad43f817faaf 100644
--- a/libs/core/src/main/java/org/opensearch/core/common/io/stream/BytesStreamInput.java
+++ b/libs/core/src/main/java/org/opensearch/core/common/io/stream/BytesStreamInput.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.core.common.io.stream;
 
+import org.apache.lucene.util.BitUtil;
 import org.apache.lucene.util.BytesRef;
 
 import java.io.EOFException;
@@ -121,4 +122,33 @@ public int read() throws IOException {
         return bytes[pos++] & 0xFF;
     }
 
+    @Override
+    public short readShort() throws IOException {
+        if (available() < Short.BYTES) {
+            throw new EOFException();
+        }
+        short value = (short) BitUtil.VH_BE_SHORT.get(bytes, pos);
+        pos += Short.BYTES;
+        return value;
+    }
+
+    @Override
+    public int readInt() throws IOException {
+        if (available() < Integer.BYTES) {
+            throw new EOFException();
+        }
+        int value = (int) BitUtil.VH_BE_INT.get(bytes, pos);
+        pos += Integer.BYTES;
+        return value;
+    }
+
+    @Override
+    public long readLong() throws IOException {
+        if (available() < Long.BYTES) {
+            throw new EOFException();
+        }
+        long value = (long) BitUtil.VH_BE_LONG.get(bytes, pos);
+        pos += Long.BYTES;
+        return value;
+    }
 }
diff --git a/libs/core/src/main/java/org/opensearch/core/util/BytesRefUtils.java b/libs/core/src/main/java/org/opensearch/core/util/BytesRefUtils.java
index 30c9f182fcae6..2aad068534b9d 100644
--- a/libs/core/src/main/java/org/opensearch/core/util/BytesRefUtils.java
+++ b/libs/core/src/main/java/org/opensearch/core/util/BytesRefUtils.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.core.util;
 
+import org.apache.lucene.util.BitUtil;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefArray;
 import org.apache.lucene.util.BytesRefBuilder;
@@ -103,12 +104,12 @@ public static int sortAndDedup(final BytesRefArray bytes, final int[] indices) {
         return uniqueCount;
     }
 
+    /**
+     * Decodes a long value written as bytes in big endian order.
+     * @param bytes in big endian order
+     * @return long value
+     */
     public static long bytesToLong(BytesRef bytes) {
-        int high = (bytes.bytes[bytes.offset + 0] << 24) | ((bytes.bytes[bytes.offset + 1] & 0xff) << 16) | ((bytes.bytes[bytes.offset + 2]
-            & 0xff) << 8) | (bytes.bytes[bytes.offset + 3] & 0xff);
-        int low = (bytes.bytes[bytes.offset + 4] << 24) | ((bytes.bytes[bytes.offset + 5] & 0xff) << 16) | ((bytes.bytes[bytes.offset + 6]
-            & 0xff) << 8) | (bytes.bytes[bytes.offset + 7] & 0xff);
-        return (((long) high) << 32) | (low & 0x0ffffffffL);
+        return (long) BitUtil.VH_BE_LONG.get(bytes.bytes, bytes.offset);
     }
-
 }
diff --git a/libs/core/src/test/java/org/opensearch/core/util/BytesRefUtilsTests.java b/libs/core/src/test/java/org/opensearch/core/util/BytesRefUtilsTests.java
index 421263b883f2a..214f9292ae3a5 100644
--- a/libs/core/src/test/java/org/opensearch/core/util/BytesRefUtilsTests.java
+++ b/libs/core/src/test/java/org/opensearch/core/util/BytesRefUtilsTests.java
@@ -12,7 +12,6 @@
 import org.apache.lucene.util.BytesRefArray;
 import org.apache.lucene.util.BytesRefBuilder;
 import org.apache.lucene.util.Counter;
-import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.nio.ByteBuffer;
@@ -90,8 +89,12 @@ public void testSortByteRefArray() {
     }
 
     public void testBytesToLong() {
-        final long value = randomLong();
-        final BytesReference buffer = BytesReference.fromByteBuffer(ByteBuffer.allocate(8).putLong(value).flip());
-        assertThat(BytesRefUtils.bytesToLong(buffer.toBytesRef()), equalTo(value));
+        long value = randomLong();
+        int paddingStart = randomIntBetween(0, 10);
+        int paddingEnd = randomIntBetween(0, 10);
+        byte[] bytes = new byte[paddingStart + Long.BYTES + paddingEnd];
+        ByteBuffer.wrap(bytes).putLong(paddingStart, value);
+        BytesRef bytesRef = new BytesRef(bytes, paddingStart, Long.BYTES);
+        assertThat(BytesRefUtils.bytesToLong(bytesRef), equalTo(value));
     }
 }
diff --git a/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/DefaultSpanScope.java b/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/DefaultSpanScope.java
index decbf49f795c4..93600da510977 100644
--- a/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/DefaultSpanScope.java
+++ b/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/DefaultSpanScope.java
@@ -21,6 +21,7 @@
 class DefaultSpanScope implements SpanScope {
     private final Span span;
     private final SpanScope previousSpanScope;
+    private final Span beforeSpan;
     private static final ThreadLocal<SpanScope> spanScopeThreadLocal = new ThreadLocal<>();
     private final TracerContextStorage<String, Span> tracerContextStorage;
 
@@ -29,8 +30,14 @@ class DefaultSpanScope implements SpanScope {
      * @param span span
      * @param previousSpanScope before attached span scope.
      */
-    private DefaultSpanScope(Span span, SpanScope previousSpanScope, TracerContextStorage<String, Span> tracerContextStorage) {
+    private DefaultSpanScope(
+        Span span,
+        final Span beforeSpan,
+        SpanScope previousSpanScope,
+        TracerContextStorage<String, Span> tracerContextStorage
+    ) {
         this.span = Objects.requireNonNull(span);
+        this.beforeSpan = beforeSpan;
         this.previousSpanScope = previousSpanScope;
         this.tracerContextStorage = tracerContextStorage;
     }
@@ -43,7 +50,8 @@ private DefaultSpanScope(Span span, SpanScope previousSpanScope, TracerContextSt
      */
     public static SpanScope create(Span span, TracerContextStorage<String, Span> tracerContextStorage) {
         final SpanScope beforeSpanScope = spanScopeThreadLocal.get();
-        SpanScope newSpanScope = new DefaultSpanScope(span, beforeSpanScope, tracerContextStorage);
+        final Span beforeSpan = tracerContextStorage.get(TracerContextStorage.CURRENT_SPAN);
+        SpanScope newSpanScope = new DefaultSpanScope(span, beforeSpan, beforeSpanScope, tracerContextStorage);
         return newSpanScope;
     }
 
@@ -61,8 +69,8 @@ public SpanScope attach() {
 
     private void detach() {
         spanScopeThreadLocal.set(previousSpanScope);
-        if (previousSpanScope != null) {
-            tracerContextStorage.put(TracerContextStorage.CURRENT_SPAN, previousSpanScope.getSpan());
+        if (beforeSpan != null) {
+            tracerContextStorage.put(TracerContextStorage.CURRENT_SPAN, beforeSpan);
         } else {
             tracerContextStorage.put(TracerContextStorage.CURRENT_SPAN, null);
         }
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
new file mode 100644
index 0000000000000..40ff2c2f4cdbe
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/11_match_field_match_only_text.yml
@@ -0,0 +1,70 @@
+# integration tests for queries with specific analysis chains
+
+"match query with stacked stems":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  # Tests the match query stemmed tokens are "stacked" on top of the unstemmed
+  # versions in the same position.
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 1
+            analysis:
+              analyzer:
+                index:
+                  tokenizer: standard
+                  filter: [lowercase]
+                search:
+                  rest_total_hits_as_int: true
+                  tokenizer: standard
+                  filter: [lowercase, keyword_repeat, porter_stem, unique_stem]
+              filter:
+                unique_stem:
+                  type: unique
+                  only_on_same_position: true
+          mappings:
+            properties:
+              text:
+                type: match_only_text
+                analyzer: index
+                search_analyzer: search
+
+  - do:
+      index:
+        index: test
+        id:    1
+        body:  { "text": "the fox runs across the street" }
+        refresh: true
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: fox runs
+                operator: AND
+  - match: {hits.total: 1}
+
+  - do:
+      index:
+        index: test
+        id:    2
+        body:  { "text": "run fox run" }
+        refresh: true
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: fox runs
+                operator: AND
+  - match: {hits.total: 2}
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
new file mode 100644
index 0000000000000..95b648dee47c8
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/20_ngram_search_field_match_only_text.yml
@@ -0,0 +1,144 @@
+"ngram search":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 0
+            analysis:
+              analyzer:
+                my_analyzer:
+                  tokenizer: standard
+                  filter: [my_ngram]
+              filter:
+                my_ngram:
+                  type: ngram
+                  min: 2,
+                  max: 2
+          mappings:
+            properties:
+              text:
+                type: match_only_text
+                analyzer: my_analyzer
+
+  - do:
+      index:
+        index: test
+        id:    1
+        body:  { "text": "foo bar baz" }
+        refresh: true
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: foa
+  - match: {hits.total: 1}
+
+---
+"testNGramCopyField":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 0
+            max_ngram_diff: 9
+            analysis:
+              analyzer:
+                my_ngram_analyzer:
+                  tokenizer: my_ngram_tokenizer
+              tokenizer:
+                my_ngram_tokenizer:
+                  type: ngram
+                  min: 1,
+                  max: 10
+                  token_chars: []
+          mappings:
+            properties:
+              origin:
+                type: match_only_text
+                copy_to: meta
+              meta:
+                type: match_only_text
+                analyzer: my_ngram_analyzer
+
+  - do:
+      index:
+        index: test
+        id:    1
+        body:  { "origin": "C.A1234.5678" }
+        refresh: true
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              meta:
+                query: 1234
+  - match: {hits.total: 1}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              meta:
+                query: 1234.56
+  - match: {hits.total: 1}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              meta:
+                query: A1234
+  - match: {hits.total: 1}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            term:
+              meta:
+                value: a1234
+  - match: {hits.total: 0}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              meta:
+                query: A1234
+                analyzer: my_ngram_analyzer
+  - match: {hits.total: 1}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              meta:
+                query: a1234
+                analyzer: my_ngram_analyzer
+  - match: {hits.total: 1}
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
new file mode 100644
index 0000000000000..597f55679a2c6
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/30_ngram_highligthing_field_match_only_text.yml
@@ -0,0 +1,137 @@
+"ngram highlighting":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 0
+            index.max_ngram_diff: 19
+            analysis:
+              tokenizer:
+                my_ngramt:
+                  type: ngram
+                  min_gram: 1
+                  max_gram: 20
+                  token_chars: letter,digit
+              filter:
+                my_ngram:
+                  type: ngram
+                  min_gram: 1
+                  max_gram: 20
+              analyzer:
+                name2_index_analyzer:
+                  tokenizer: whitespace
+                  filter: [my_ngram]
+                name_index_analyzer:
+                  tokenizer: my_ngramt
+                name_search_analyzer:
+                  tokenizer: whitespace
+          mappings:
+            properties:
+              name:
+                type: match_only_text
+                term_vector: with_positions_offsets
+                analyzer: name_index_analyzer
+                search_analyzer: name_search_analyzer
+              name2:
+                type: match_only_text
+                term_vector: with_positions_offsets
+                analyzer: name2_index_analyzer
+                search_analyzer: name_search_analyzer
+
+  - do:
+      index:
+        index: test
+        id:    1
+        refresh: true
+        body:
+          name: logicacmg ehemals avinci - the know how company
+          name2: logicacmg ehemals avinci - the know how company
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              name:
+                query: logica m
+          highlight:
+            fields:
+              - name: {}
+  - match: {hits.total: 1}
+  - match: {hits.hits.0.highlight.name.0: "<em>logica</em>c<em>m</em>g ehe<em>m</em>als avinci - the know how co<em>m</em>pany"}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              name:
+                query: logica ma
+          highlight:
+            fields:
+              - name: {}
+  - match: {hits.total: 1}
+  - match: {hits.hits.0.highlight.name.0: "<em>logica</em>cmg ehe<em>ma</em>ls avinci - the know how company"}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              name:
+                query: logica
+          highlight:
+            fields:
+              - name: {}
+  - match: {hits.total: 1}
+  - match: {hits.hits.0.highlight.name.0: "<em>logica</em>cmg ehemals avinci - the know how company"}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              name2:
+                query: logica m
+          highlight:
+            fields:
+              - name2: {}
+  - match: {hits.total: 1}
+  - match: {hits.hits.0.highlight.name2.0: "<em>logicacmg</em> <em>ehemals</em> avinci - the know how <em>company</em>"}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              name2:
+                query: logica ma
+          highlight:
+            fields:
+              - name2: {}
+  - match: {hits.total: 1}
+  - match: {hits.hits.0.highlight.name2.0: "<em>logicacmg</em> <em>ehemals</em> avinci - the know how company"}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              name2:
+                query: logica
+          highlight:
+            fields:
+              - name2: {}
+  - match: {hits.total: 1}
+  - match: {hits.hits.0.highlight.name2.0: "<em>logicacmg</em> ehemals avinci - the know how company"}
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
new file mode 100644
index 0000000000000..ddebb1d76acbc
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/40_query_string_field_match_only_text.yml
@@ -0,0 +1,59 @@
+---
+"Test query string with snowball":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+          index:  test
+          body:
+            mappings:
+              properties:
+                field:
+                  type: match_only_text
+                number:
+                  type: integer
+
+  - do:
+      index:
+          index:  test
+          id:     1
+          body:   { field: foo bar}
+
+  - do:
+      indices.refresh:
+        index: [test]
+
+  - do:
+      indices.validate_query:
+        index: test
+        q: field:bars
+        analyzer: snowball
+
+  - is_true: valid
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        q: field:bars
+        analyzer: snowball
+
+  - match: {hits.total: 1}
+
+  - do:
+      explain:
+        index:  test
+        id:     1
+        q: field:bars
+        analyzer: snowball
+
+  - is_true: matched
+
+  - do:
+      count:
+        index: test
+        q: field:bars
+        analyzer: snowball
+
+  - match: {count : 1}
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
new file mode 100644
index 0000000000000..97f3fb65e94a2
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/41_query_string_with_default_analyzer_field_match_only_text.yml
@@ -0,0 +1,42 @@
+---
+"Test default search analyzer is applied":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            index.analysis.analyzer.default.type: simple
+            index.analysis.analyzer.default_search.type: german
+          mappings:
+            properties:
+              body:
+                type: match_only_text
+
+  - do:
+      index:
+        index: test
+        id: 1
+        body:
+          body: Ich lese die Bücher
+
+  - do:
+      indices.refresh:
+        index: [ test ]
+
+  - do:
+      search:
+        index: test
+        q: "body:Bücher"
+
+  - match: { hits.total.value: 0 }
+
+  - do:
+      search:
+        index: test
+        q: "body:Bücher"
+        analyzer: simple
+
+  - match: { hits.total.value: 1 }
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
new file mode 100644
index 0000000000000..0c263a47a38e6
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/50_queries_with_synonyms_field_match_only_text.yml
@@ -0,0 +1,348 @@
+---
+"Test common terms query with stacked tokens":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+      features: "allowed_warnings"
+
+  - do:
+      indices.create:
+          index: test
+          body:
+            settings:
+              analysis:
+                filter:
+                  syns:
+                    type: synonym
+                    synonyms: [ "quick,fast" ]
+                analyzer:
+                  syns:
+                    tokenizer: standard
+                    filter: [ "syns" ]
+            mappings:
+              properties:
+                field1:
+                  type: match_only_text
+                  analyzer: syns
+                field2:
+                  type: match_only_text
+                  analyzer: syns
+
+  - do:
+      index:
+          index: test
+          id: 3
+          body:
+            field1: quick lazy huge brown pidgin
+            field2: the quick lazy huge brown fox jumps over the tree
+
+  - do:
+      index:
+          index: test
+          id: 1
+          body:
+            field1: the quick brown fox
+
+  - do:
+      index:
+          index: test
+          id: 2
+          body:
+            field1: the quick lazy huge brown fox jumps over the tree
+          refresh: true
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [common] used, replaced by [[match] query which can efficiently skip blocks of documents if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            common:
+              field1:
+                query: the fast brown
+                cutoff_frequency: 3
+                low_freq_operator: or
+  - match: { hits.total: 3 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.1._id: "2" }
+  - match: { hits.hits.2._id: "3" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [common] used, replaced by [[match] query which can efficiently skip blocks of documents if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            common:
+              field1:
+                query: the fast brown
+                cutoff_frequency: 3
+                low_freq_operator: and
+  - match: { hits.total: 2 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.1._id: "2" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [common] used, replaced by [[match] query which can efficiently skip blocks of documents if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            common:
+              field1:
+                query: the fast brown
+                cutoff_frequency: 3
+  - match: { hits.total: 3 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.1._id: "2" }
+  - match: { hits.hits.2._id: "3" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [common] used, replaced by [[match] query which can efficiently skip blocks of documents if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            common:
+              field1:
+                query: the fast huge fox
+                minimum_should_match:
+                  low_freq: 3
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "2" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [common] used, replaced by [[match] query which can efficiently skip blocks of documents if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            common:
+              field1:
+                query: the fast lazy fox brown
+                cutoff_frequency: 1
+                minimum_should_match:
+                  high_freq: 5
+  - match: { hits.total: 2 }
+  - match: { hits.hits.0._id: "2" }
+  - match: { hits.hits.1._id: "1" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [common] used, replaced by [[match] query which can efficiently skip blocks of documents if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            common:
+              field1:
+                query: the fast lazy fox brown
+                cutoff_frequency: 1
+                minimum_should_match:
+                  high_freq: 6
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "2" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [common] used, replaced by [[match] query which can efficiently skip blocks of documents if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            common:
+              field1:
+                query: the fast lazy fox brown
+                cutoff_frequency: 1
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "2" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [common] used, replaced by [[match] query which can efficiently skip blocks of documents if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            common:
+              field1:
+                query: the quick brown
+                cutoff_frequency: 3
+  - match: { hits.total: 3 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.1._id: "2" }
+  - match: { hits.hits.2._id: "3" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [cutoff_frequency] used, replaced by [you can omit this option, the [match] query can skip block of documents efficiently if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              field1:
+                query: the fast brown
+                cutoff_frequency: 3
+                operator: and
+  - match: { hits.total: 2 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.1._id: "2" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [cutoff_frequency] used, replaced by [you can omit this option, the [match] query can skip block of documents efficiently if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              field1:
+                query: the fast brown
+                cutoff_frequency: 3
+                operator: or
+  - match: { hits.total: 3 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.1._id: "2" }
+  - match: { hits.hits.2._id: "3" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [cutoff_frequency] used, replaced by [you can omit this option, the [match] query can skip block of documents efficiently if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              field1:
+                query: the fast brown
+                cutoff_frequency: 3
+                minimum_should_match: 3
+  - match: { hits.total: 2 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.1._id: "2" }
+
+  - do:
+      allowed_warnings:
+        - 'Deprecated field [cutoff_frequency] used, replaced by [you can omit this option, the [multi_match] query can skip block of documents efficiently if the total number of hits is not tracked]'
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            multi_match:
+              query: the fast brown
+              fields: [ "field1", "field2" ]
+              cutoff_frequency: 3
+              operator: and
+  - match: { hits.total: 3 }
+  - match: { hits.hits.0._id: "3" }
+  - match: { hits.hits.1._id: "1" }
+  - match: { hits.hits.2._id: "2" }
+
+---
+"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"
+  - do:
+      indices.create:
+          index: test
+          body:
+            settings:
+              analysis:
+                filter:
+                  synonym:
+                    type: synonym
+                    synonyms: [ "quick,fast" ]
+                analyzer:
+                  index:
+                    type: custom
+                    tokenizer: standard
+                    filter: lowercase
+                  search:
+                    rest_total_hits_as_int: true
+                    type: custom
+                    tokenizer: standard
+                    filter: [ lowercase, synonym ]
+            mappings:
+              properties:
+                text:
+                  type: match_only_text
+                  analyzer: index
+                  search_analyzer: search
+
+  - do:
+      index:
+          index: test
+          id: 1
+          body:
+            text: quick brown fox
+          refresh: true
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: quick
+                operator: and
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: quick brown
+                operator: and
+  - match: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: fast
+                operator: and
+  - match: { hits.total: 1 }
+
+  - do:
+      index:
+          index: test
+          id: 2
+          body:
+            text: fast brown fox
+          refresh: true
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: quick
+                operator: and
+  - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: quick brown
+                operator: and
+  - match: { hits.total: 2 }
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
new file mode 100644
index 0000000000000..91a8b1509517e
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/60_synonym_graph_field_match_only_text.yml
@@ -0,0 +1,209 @@
+setup:
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            index:
+              number_of_shards: 1     # keep scoring stable
+            analysis:
+              filter:
+                syns:
+                  type: synonym
+                  synonyms: [ "wtf, what the fudge", "foo, bar baz" ]
+                graph_syns:
+                  type: synonym_graph
+                  synonyms: [ "wtf, what the fudge", "foo, bar baz" ]
+              analyzer:
+                lower_syns:
+                  type: custom
+                  tokenizer: standard
+                  filter: [ lowercase, syns ]
+                lower_graph_syns:
+                  type: custom
+                  tokenizer: standard
+                  filter: [ lowercase, graph_syns ]
+          mappings:
+            properties:
+              field:
+                type: match_only_text
+
+  - do:
+      index:
+          index: test
+          id: 1
+          body:
+            text: say wtf happened foo
+  - do:
+      index:
+          index: test
+          id: 2
+          body:
+            text: bar baz what the fudge man
+
+  - do:
+      index:
+          index: test
+          id: 3
+          body:
+            text: wtf
+
+  - do:
+      index:
+          index: test
+          id: 4
+          body:
+            text: what is the name for fudge
+
+  - do:
+      index:
+          index: test
+          id: 5
+          body:
+            text: bar two three
+
+  - do:
+      index:
+          index: test
+          id: 6
+          body:
+            text: bar baz two three
+          refresh: true
+
+---
+"simple multiterm phrase":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match_phrase:
+              text:
+                query: foo two three
+                analyzer: lower_syns
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "5" }  # incorrect match because we're not using graph synonyms
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match_phrase:
+              text:
+                query: foo two three
+                analyzer: lower_graph_syns
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "6" }  # correct match because we're using graph synonyms
+
+---
+"simple multiterm and":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: say what the fudge
+                analyzer: lower_syns
+                operator: and
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "1" }   # non-graph synonyms coincidentally give us the correct answer here
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: say what the fudge
+                analyzer: lower_graph_syns
+                operator: and
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "1" }
+
+---
+"minimum should match":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: three what the fudge foo
+                operator: or
+                analyzer: lower_graph_syns
+                auto_generate_synonyms_phrase_query: false
+  - match: { hits.total: 6 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: three what the fudge foo
+                operator: or
+                analyzer: lower_graph_syns
+                minimum_should_match: 80%
+  - match: { hits.total: 3 }
+  - match: { hits.hits.0._id: "2" }
+  - match: { hits.hits.1._id: "6" }
+  - match: { hits.hits.2._id: "1" }
+
+---
+"multiterm synonyms phrase":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match:
+              text:
+                query: wtf
+                operator: and
+                analyzer: lower_graph_syns
+  - match: { hits.total: 3 }
+  - match: { hits.hits.0._id: "2" }
+  - match: { hits.hits.1._id: "3" }
+  - match: { hits.hits.2._id: "1" }
+
+---
+"phrase prefix":
+  - do:
+      index:
+          index: test
+          id: 7
+          body:
+            text: "WTFD!"
+
+  - do:
+      index:
+          index: test
+          id: 8
+          body:
+            text: "Weird Al's WHAT THE FUDGESICLE"
+          refresh: true
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body:
+          query:
+            match_phrase_prefix:
+              text:
+                query: wtf
+                analyzer: lower_graph_syns
+  - match: { hits.total: 5 }
+  - match: { hits.hits.0._id: "3" }
+  - match: { hits.hits.1._id: "7" }
+  - match: { hits.hits.2._id: "1" }
+  - match: { hits.hits.3._id: "8" }
+  - match: { hits.hits.4._id: "2" }
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
new file mode 100644
index 0000000000000..9792c9d2695ea
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals_field_match_only_text.yml
@@ -0,0 +1,67 @@
+# integration tests for intervals queries using analyzers
+setup:
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+        index:  test
+        body:
+          mappings:
+            properties:
+              text:
+                type: match_only_text
+                analyzer: standard
+              text_en:
+                type: match_only_text
+                analyzer: english
+  - do:
+      bulk:
+        refresh: true
+        body:
+          - '{"index": {"_index": "test", "_id": "4"}}'
+          - '{"text"    : "Outside it is cold and wet and raining cats and dogs",
+                "text_en" : "Outside it is cold and wet and raining cats and dogs"}'
+
+---
+"Test use_field":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      catch: bad_request
+      search:
+        index: test
+        body:
+          query:
+            intervals:
+              text:
+                all_of:
+                  intervals:
+                    - match:
+                        query: cats
+                    - match:
+                        query: dog
+                  max_gaps: 1
+  - match: { status: 400 }
+  - match: { error.type: "search_phase_execution_exception"}
+  - match: { error.reason: "all shards failed"}
+  - do:
+      catch: bad_request
+      search:
+        index: test
+        body:
+          query:
+            intervals:
+              text:
+                all_of:
+                  intervals:
+                    - match:
+                        query: cats
+                    - match:
+                        query: dog
+                        use_field: text_en
+                  max_gaps: 1
+  - match: { status: 400 }
+  - match: { error.type: "search_phase_execution_exception"}
+  - match: { error.reason: "all shards failed"}
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
new file mode 100644
index 0000000000000..aff2b3f11101c
--- /dev/null
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/20_phrase_field_match_only_text.yml
@@ -0,0 +1,238 @@
+# Integration tests for the phrase suggester with a few analyzers
+
+setup:
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 1
+            analysis:
+              analyzer:
+                body:
+                  tokenizer: standard
+                  filter: [lowercase]
+                bigram:
+                  tokenizer: standard
+                  filter: [lowercase, bigram]
+                ngram:
+                  tokenizer: standard
+                  filter: [lowercase, ngram]
+                reverse:
+                  tokenizer: standard
+                  filter: [lowercase, reverse]
+              filter:
+                bigram:
+                  type: shingle
+                  output_unigrams: false
+                  min_shingle_size: 2
+                  max_shingle_size: 2
+                ngram:
+                  type: shingle
+                  output_unigrams: true
+                  min_shingle_size: 2
+                  max_shingle_size: 2
+          mappings:
+            properties:
+              body:
+                type: match_only_text
+                analyzer: body
+                fields:
+                  bigram:
+                    type: match_only_text
+                    analyzer: bigram
+                  ngram:
+                    type: match_only_text
+                    analyzer: ngram
+                  reverse:
+                    type: match_only_text
+                    analyzer: reverse
+
+  - do:
+      bulk:
+        index: test
+        refresh: true
+        body: |
+          { "index": {} }
+          { "body": "Xorr the God-Jewel" }
+          { "index": {} }
+          { "body": "Xorn" }
+          { "index": {} }
+          { "body": "Arthur, King of the Britons" }
+          { "index": {} }
+          { "body": "Sir Lancelot the Brave" }
+          { "index": {} }
+          { "body": "Patsy, Arthur's Servant" }
+          { "index": {} }
+          { "body": "Sir Robin the Not-Quite-So-Brave-as-Sir-Lancelot" }
+          { "index": {} }
+          { "body": "Sir Bedevere the Wise" }
+          { "index": {} }
+          { "body": "Sir Galahad the Pure" }
+          { "index": {} }
+          { "body": "Miss Islington, the Witch" }
+          { "index": {} }
+          { "body": "Zoot" }
+          { "index": {} }
+          { "body": "Leader of Robin's Minstrels" }
+          { "index": {} }
+          { "body": "Old Crone" }
+          { "index": {} }
+          { "body": "Frank, the Historian" }
+          { "index": {} }
+          { "body": "Frank's Wife" }
+          { "index": {} }
+          { "body": "Dr. Piglet" }
+          { "index": {} }
+          { "body": "Dr. Winston" }
+          { "index": {} }
+          { "body": "Sir Robin (Stand-in)" }
+          { "index": {} }
+          { "body": "Knight Who Says Ni" }
+          { "index": {} }
+          { "body": "Police sergeant who stops the film" }
+
+---
+"sorts by score":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        size: 0
+        index: test
+        body:
+          suggest:
+            text: xor the got-jewel
+            test:
+              phrase:
+                field: body.ngram
+                force_unigrams: true
+                max_errors: 0.5
+                direct_generator:
+                  - field: body.ngram
+                    min_word_length: 1
+                    suggest_mode: always
+
+  - match: {suggest.test.0.options.0.text: xorr the god jewel}
+  - match: {suggest.test.0.options.1.text: xorn the god jewel}
+
+---
+"breaks ties by sorting terms":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  # This runs the suggester without bigrams so we can be sure of the sort order
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        size: 0
+        index: test
+        body:
+          suggest:
+            text: xor the got-jewel
+            test:
+              phrase:
+                field: body
+                analyzer: body
+                force_unigrams: true
+                max_errors: 0.5
+                direct_generator:
+                  - field: body
+                    min_word_length: 1
+                    suggest_mode: always
+
+  # The scores are identical but xorn comes first because it sorts first
+  - match: {suggest.test.0.options.0.text: xorn the god jewel}
+  - match: {suggest.test.0.options.1.text: xorr the god jewel}
+  - match: {suggest.test.0.options.0.score: $body.suggest.test.0.options.0.score}
+
+---
+"fails when asked to run on a field without unigrams":
+  - do:
+      catch: /since it doesn't emit unigrams/
+      search:
+        rest_total_hits_as_int: true
+        size: 0
+        index: test
+        body:
+          suggest:
+            text: xor the got-jewel
+            test:
+              phrase:
+                field: body.bigram
+
+  - do:
+      catch: /since it doesn't emit unigrams/
+      search:
+        rest_total_hits_as_int: true
+        size: 0
+        index: test
+        body:
+          suggest:
+            text: xor the got-jewel
+            test:
+              phrase:
+                field: body.bigram
+                analyzer: bigram
+
+---
+"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"
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        size: 0
+        index: test
+        body:
+          suggest:
+            text: xor the got-jewel
+            test:
+              phrase:
+                field: body.bigram
+                force_unigrams: false
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        size: 0
+        index: test
+        body:
+          suggest:
+            text: xor the got-jewel
+            test:
+              phrase:
+                field: body.bigram
+                analyzer: bigram
+                force_unigrams: false
+
+---
+"reverse suggestions":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        size: 0
+        index: test
+        body:
+          suggest:
+            text: Artur, Ging of the Britons
+            test:
+              phrase:
+                field: body.ngram
+                force_unigrams: true
+                max_errors: 0.5
+                direct_generator:
+                  - field: body.reverse
+                    min_word_length: 1
+                    suggest_mode: always
+                    pre_filter: reverse
+                    post_filter: reverse
+
+  - match: {suggest.test.0.options.0.text: arthur king of the britons}
diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle
index e126cf37e33a2..c0ff155ce1038 100644
--- a/modules/ingest-geoip/build.gradle
+++ b/modules/ingest-geoip/build.gradle
@@ -39,9 +39,9 @@ opensearchplugin {
 }
 
 dependencies {
-  api('com.maxmind.geoip2:geoip2:4.1.0')
+  api('com.maxmind.geoip2:geoip2:4.2.0')
   // geoip2 dependencies:
-  api('com.maxmind.db:maxmind-db:3.0.0')
+  api('com.maxmind.db:maxmind-db:3.1.0')
   api("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
   api("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
 
diff --git a/modules/ingest-geoip/licenses/geoip2-4.1.0.jar.sha1 b/modules/ingest-geoip/licenses/geoip2-4.1.0.jar.sha1
deleted file mode 100644
index 0d124299e4cfb..0000000000000
--- a/modules/ingest-geoip/licenses/geoip2-4.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b6b356cc91863409ba3475a148ee11a3a6d6aa4b
\ No newline at end of file
diff --git a/modules/ingest-geoip/licenses/geoip2-4.2.0.jar.sha1 b/modules/ingest-geoip/licenses/geoip2-4.2.0.jar.sha1
new file mode 100644
index 0000000000000..b6bfeeb9da60b
--- /dev/null
+++ b/modules/ingest-geoip/licenses/geoip2-4.2.0.jar.sha1
@@ -0,0 +1 @@
+78ff932dc13ac41dd1f0fd9e7405a7f4ad815ce0
\ No newline at end of file
diff --git a/modules/ingest-geoip/licenses/maxmind-db-3.0.0.jar.sha1 b/modules/ingest-geoip/licenses/maxmind-db-3.0.0.jar.sha1
deleted file mode 100644
index 89b0c4c49b450..0000000000000
--- a/modules/ingest-geoip/licenses/maxmind-db-3.0.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-79dcda62168a77caf595f8fda101baa17fef125d
\ No newline at end of file
diff --git a/modules/ingest-geoip/licenses/maxmind-db-3.1.0.jar.sha1 b/modules/ingest-geoip/licenses/maxmind-db-3.1.0.jar.sha1
new file mode 100644
index 0000000000000..9db7c7319af0b
--- /dev/null
+++ b/modules/ingest-geoip/licenses/maxmind-db-3.1.0.jar.sha1
@@ -0,0 +1 @@
+2008992ab45d61c7b28a18678b5df82272529da3
\ No newline at end of file
diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheModulePlugin.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheModulePlugin.java
index 434a117d9b47e..6b33ac3b6be08 100644
--- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheModulePlugin.java
+++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheModulePlugin.java
@@ -65,6 +65,7 @@ public ScriptEngine getScriptEngine(Settings settings, Collection<ScriptContext<
     public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         return Arrays.asList(
             new ActionHandler<>(SearchTemplateAction.INSTANCE, TransportSearchTemplateAction.class),
+            new ActionHandler<>(RenderSearchTemplateAction.INSTANCE, TransportRenderSearchTemplateAction.class),
             new ActionHandler<>(MultiSearchTemplateAction.INSTANCE, TransportMultiSearchTemplateAction.class)
         );
     }
diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RenderSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RenderSearchTemplateAction.java
new file mode 100644
index 0000000000000..1feb916c4ce73
--- /dev/null
+++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RenderSearchTemplateAction.java
@@ -0,0 +1,21 @@
+/*
+ * 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.script.mustache;
+
+import org.opensearch.action.ActionType;
+
+public class RenderSearchTemplateAction extends ActionType<SearchTemplateResponse> {
+
+    public static final RenderSearchTemplateAction INSTANCE = new RenderSearchTemplateAction();
+    public static final String NAME = "indices:data/read/search/template/render";
+
+    private RenderSearchTemplateAction() {
+        super(NAME, SearchTemplateResponse::new);
+    }
+}
diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java
index 7a94fc45837d9..9ffa2c94cb56f 100644
--- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java
+++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java
@@ -81,6 +81,6 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
             renderRequest.setScript(id);
         }
 
-        return channel -> client.execute(SearchTemplateAction.INSTANCE, renderRequest, new RestToXContentListener<>(channel));
+        return channel -> client.execute(RenderSearchTemplateAction.INSTANCE, renderRequest, new RestToXContentListener<>(channel));
     }
 }
diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequest.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequest.java
index 1aabea30fc651..d02c5f1efa591 100644
--- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequest.java
+++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequest.java
@@ -259,16 +259,25 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public String[] indices() {
+        if (request == null) {
+            return new String[0];
+        }
         return request.indices();
     }
 
     @Override
     public IndicesOptions indicesOptions() {
+        if (request == null) {
+            return SearchRequest.DEFAULT_INDICES_OPTIONS;
+        }
         return request.indicesOptions();
     }
 
     @Override
     public IndicesRequest indices(String... indices) {
+        if (request == null) {
+            return new SearchRequest(new String[0]).indices(indices);
+        }
         return request.indices(indices);
     }
 }
diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportRenderSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportRenderSearchTemplateAction.java
new file mode 100644
index 0000000000000..993d77ffaa75c
--- /dev/null
+++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportRenderSearchTemplateAction.java
@@ -0,0 +1,30 @@
+/*
+ * 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.script.mustache;
+
+import org.opensearch.action.support.ActionFilters;
+import org.opensearch.client.node.NodeClient;
+import org.opensearch.common.inject.Inject;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.script.ScriptService;
+import org.opensearch.transport.TransportService;
+
+public class TransportRenderSearchTemplateAction extends TransportSearchTemplateAction {
+
+    @Inject
+    public TransportRenderSearchTemplateAction(
+        TransportService transportService,
+        ActionFilters actionFilters,
+        ScriptService scriptService,
+        NamedXContentRegistry xContentRegistry,
+        NodeClient client
+    ) {
+        super(RenderSearchTemplateAction.NAME, transportService, actionFilters, scriptService, xContentRegistry, client);
+    }
+}
diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java
index 6e8b9d059b583..d75cc0337b66c 100644
--- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java
+++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java
@@ -61,9 +61,9 @@ public class TransportSearchTemplateAction extends HandledTransportAction<Search
 
     private static final String TEMPLATE_LANG = MustacheScriptEngine.NAME;
 
-    private final ScriptService scriptService;
-    private final NamedXContentRegistry xContentRegistry;
-    private final NodeClient client;
+    protected final ScriptService scriptService;
+    protected final NamedXContentRegistry xContentRegistry;
+    protected final NodeClient client;
 
     @Inject
     public TransportSearchTemplateAction(
@@ -79,6 +79,20 @@ public TransportSearchTemplateAction(
         this.client = client;
     }
 
+    public TransportSearchTemplateAction(
+        String actionName,
+        TransportService transportService,
+        ActionFilters actionFilters,
+        ScriptService scriptService,
+        NamedXContentRegistry xContentRegistry,
+        NodeClient client
+    ) {
+        super(actionName, transportService, actionFilters, SearchTemplateRequest::new);
+        this.scriptService = scriptService;
+        this.xContentRegistry = xContentRegistry;
+        this.client = client;
+    }
+
     @Override
     protected void doExecute(Task task, SearchTemplateRequest request, ActionListener<SearchTemplateResponse> listener) {
         final SearchTemplateResponse response = new SearchTemplateResponse();
diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java
index 72443d1323b44..71ce616fd5d94 100644
--- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java
+++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.script.mustache;
 
+import org.opensearch.action.search.SearchRequest;
 import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.script.ScriptType;
 import org.opensearch.search.RandomSearchRequestGenerator;
@@ -110,4 +111,19 @@ public static SearchTemplateRequest createRandomRequest() {
         request.setRequest(RandomSearchRequestGenerator.randomSearchRequest(SearchSourceBuilder::searchSource));
         return request;
     }
+
+    public void testSimulatedSearchTemplateRequest() {
+        SearchTemplateRequest request = new SearchTemplateRequest();
+        request.setSimulate(true);
+
+        assertEquals(0, request.indices().length);
+        assertEquals(SearchRequest.DEFAULT_INDICES_OPTIONS, request.indicesOptions());
+        assertEquals(2, request.indices("index1", "index2").indices().length);
+
+        SearchTemplateRequest randomRequest = createRandomRequest();
+        int expectedIndicesLength = randomRequest.indices().length;
+        request.setSimulate(true);
+
+        assertEquals(expectedIndicesLength, randomRequest.indices().length);
+    }
 }
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
new file mode 100644
index 0000000000000..3cb8e09c70aed
--- /dev/null
+++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting_field_match_only_text.yml
@@ -0,0 +1,201 @@
+setup:
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+
+  - do:
+      indices.create:
+        index: test
+        body:
+          settings:
+            number_of_replicas: 0
+          mappings:
+            properties:
+              a_field:
+                type: search_as_you_type
+                analyzer: simple
+                max_shingle_size: 4
+              text_field:
+                type: match_only_text
+                analyzer: simple
+
+  - do:
+      index:
+        index: test
+        id: 1
+        body:
+          a_field: "quick brown fox jump lazy dog"
+          text_field: "quick brown fox jump lazy dog"
+
+  - do:
+      indices.refresh: {}
+
+---
+"phrase query":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_phrase:
+              a_field: "brown"
+          highlight:
+            fields:
+              a_field:
+                type: unified
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._source.a_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0._source.text_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0.highlight.a_field.0: "quick <em>brown</em> fox jump lazy dog" }
+
+---
+"bool prefix query":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_bool_prefix:
+              a_field: "brown fo"
+          highlight:
+            fields:
+              a_field:
+                type: unified
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._source.a_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0._source.text_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0.highlight.a_field.0: "quick <em>brown</em> fox jump lazy dog" }
+
+---
+"multi match bool prefix query 1 complete term":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fo"
+              type: "bool_prefix"
+              fields: [ "a_field", "a_field._2gram", "a_field._3gram", "a_field._4gram" ]
+          highlight:
+            fields:
+              a_field:
+                type: unified
+              a_field._2gram:
+                type: unified
+              a_field._3gram:
+                type: unified
+              a_field._4gram:
+                type: unified
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._source.a_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0._source.text_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0.highlight.a_field: ["quick <em>brown</em> fox jump lazy dog"] }
+  - match: { hits.hits.0.highlight.a_field\._2gram: null }
+  - match: { hits.hits.0.highlight.a_field\._3gram: null }
+  - match: { hits.hits.0.highlight.a_field\._4gram: null }
+
+---
+"multi match bool prefix query 2 complete term":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fox ju"
+              type: "bool_prefix"
+              fields: [ "a_field", "a_field._2gram", "a_field._3gram", "a_field._4gram" ]
+          highlight:
+            fields:
+              a_field:
+                type: unified
+              a_field._2gram:
+                type: unified
+              a_field._3gram:
+                type: unified
+              a_field._4gram:
+                type: unified
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._source.a_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0._source.text_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0.highlight.a_field: ["quick <em>brown</em> <em>fox</em> jump lazy dog"] }
+  - match: { hits.hits.0.highlight.a_field\._2gram: ["quick <em>brown fox</em> jump lazy dog"] }
+  - match: { hits.hits.0.highlight.a_field\._3gram: null }
+  - match: { hits.hits.0.highlight.a_field\._4gram: null }
+
+---
+"multi match bool prefix query 3 complete term":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fox jump la"
+              type: "bool_prefix"
+              fields: [ "a_field", "a_field._2gram", "a_field._3gram", "a_field._4gram" ]
+          highlight:
+            fields:
+              a_field:
+                type: unified
+              a_field._2gram:
+                type: unified
+              a_field._3gram:
+                type: unified
+              a_field._4gram:
+                type: unified
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._source.a_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0._source.text_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0.highlight.a_field: ["quick <em>brown</em> <em>fox</em> <em>jump</em> lazy dog"] }
+  - match: { hits.hits.0.highlight.a_field\._2gram: ["quick <em>brown fox jump</em> lazy dog"] }
+  - match: { hits.hits.0.highlight.a_field\._3gram: ["quick <em>brown fox jump</em> lazy dog"] }
+  - match: { hits.hits.0.highlight.a_field\._4gram: null }
+
+---
+"multi match bool prefix query 4 complete term":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fox jump lazy d"
+              type: "bool_prefix"
+              fields: [ "a_field", "a_field._2gram", "a_field._3gram", "a_field._4gram" ]
+          highlight:
+            fields:
+              a_field:
+                type: unified
+              a_field._2gram:
+                type: unified
+              a_field._3gram:
+                type: unified
+              a_field._4gram:
+                type: unified
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._source.a_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0._source.text_field: "quick brown fox jump lazy dog" }
+  - match: { hits.hits.0.highlight.a_field: ["quick <em>brown</em> <em>fox</em> <em>jump</em> <em>lazy</em> dog"] }
+  - match: { hits.hits.0.highlight.a_field\._2gram: ["quick <em>brown fox jump lazy</em> dog"] }
+  - match: { hits.hits.0.highlight.a_field\._3gram: ["quick <em>brown fox jump lazy</em> dog"] }
+  - match: { hits.hits.0.highlight.a_field\._4gram: ["quick <em>brown fox jump lazy</em> dog"] }
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/BasicMap.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/BasicMap.java
new file mode 100644
index 0000000000000..6ddc22420416b
--- /dev/null
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/BasicMap.java
@@ -0,0 +1,126 @@
+/*
+ * 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.search.pipeline.common;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+/**
+ * Helper for map abstractions passed to scripting processors. Throws {@link UnsupportedOperationException} for almost
+ * all methods. Subclasses just need to implement get and put.
+ */
+abstract class BasicMap implements Map<String, Object> {
+
+    /**
+     * No-args constructor.
+     */
+    protected BasicMap() {}
+
+    private static final String UNSUPPORTED_OP_ERR = " Method not supported in Search pipeline script";
+
+    @Override
+    public boolean isEmpty() {
+        throw new UnsupportedOperationException("isEmpty" + UNSUPPORTED_OP_ERR);
+    }
+
+    public int size() {
+        throw new UnsupportedOperationException("size" + UNSUPPORTED_OP_ERR);
+    }
+
+    public boolean containsKey(Object key) {
+        return get(key) != null;
+    }
+
+    public boolean containsValue(Object value) {
+        throw new UnsupportedOperationException("containsValue" + UNSUPPORTED_OP_ERR);
+    }
+
+    public Object remove(Object key) {
+        throw new UnsupportedOperationException("remove" + UNSUPPORTED_OP_ERR);
+    }
+
+    public void putAll(Map<? extends String, ?> m) {
+        throw new UnsupportedOperationException("putAll" + UNSUPPORTED_OP_ERR);
+    }
+
+    public void clear() {
+        throw new UnsupportedOperationException("clear" + UNSUPPORTED_OP_ERR);
+    }
+
+    public Set<String> keySet() {
+        throw new UnsupportedOperationException("keySet" + UNSUPPORTED_OP_ERR);
+    }
+
+    public Collection<Object> values() {
+        throw new UnsupportedOperationException("values" + UNSUPPORTED_OP_ERR);
+    }
+
+    public Set<Map.Entry<String, Object>> entrySet() {
+        throw new UnsupportedOperationException("entrySet" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public Object getOrDefault(Object key, Object defaultValue) {
+        throw new UnsupportedOperationException("getOrDefault" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public void forEach(BiConsumer<? super String, ? super Object> action) {
+        throw new UnsupportedOperationException("forEach" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public void replaceAll(BiFunction<? super String, ? super Object, ?> function) {
+        throw new UnsupportedOperationException("replaceAll" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public Object putIfAbsent(String key, Object value) {
+        throw new UnsupportedOperationException("putIfAbsent" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public boolean remove(Object key, Object value) {
+        throw new UnsupportedOperationException("remove" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public boolean replace(String key, Object oldValue, Object newValue) {
+        throw new UnsupportedOperationException("replace" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public Object replace(String key, Object value) {
+        throw new UnsupportedOperationException("replace" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public Object computeIfAbsent(String key, Function<? super String, ?> mappingFunction) {
+        throw new UnsupportedOperationException("computeIfAbsent" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public Object computeIfPresent(String key, BiFunction<? super String, ? super Object, ?> remappingFunction) {
+        throw new UnsupportedOperationException("computeIfPresent" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public Object compute(String key, BiFunction<? super String, ? super Object, ?> remappingFunction) {
+        throw new UnsupportedOperationException("compute" + UNSUPPORTED_OP_ERR);
+    }
+
+    @Override
+    public Object merge(String key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {
+        throw new UnsupportedOperationException("merge" + UNSUPPORTED_OP_ERR);
+    }
+}
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/CollapseResponseProcessor.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/CollapseResponseProcessor.java
new file mode 100644
index 0000000000000..3e6c4fef6a559
--- /dev/null
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/CollapseResponseProcessor.java
@@ -0,0 +1,122 @@
+/*
+ * 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.search.pipeline.common;
+
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.common.document.DocumentField;
+import org.opensearch.ingest.ConfigurationUtils;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.pipeline.AbstractProcessor;
+import org.opensearch.search.pipeline.Processor;
+import org.opensearch.search.pipeline.SearchResponseProcessor;
+import org.opensearch.search.pipeline.common.helpers.SearchResponseUtil;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * A simple implementation of field collapsing on search responses. Note that this is not going to work as well as
+ * field collapsing at the shard level, as implemented with the "collapse" parameter in a search request. Mostly
+ * just using this to demo the oversample / truncate_hits processors.
+ */
+public class CollapseResponseProcessor extends AbstractProcessor implements SearchResponseProcessor {
+    /**
+     * Key to reference this processor type from a search pipeline.
+     */
+    public static final String TYPE = "collapse";
+    static final String COLLAPSE_FIELD = "field";
+    private final String collapseField;
+
+    private CollapseResponseProcessor(String tag, String description, boolean ignoreFailure, String collapseField) {
+        super(tag, description, ignoreFailure);
+        this.collapseField = Objects.requireNonNull(collapseField);
+    }
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    @Override
+    public SearchResponse processResponse(SearchRequest request, SearchResponse response) {
+
+        if (response.getHits() != null) {
+            if (response.getHits().getCollapseField() != null) {
+                throw new IllegalStateException(
+                    "Cannot collapse on " + collapseField + ". Results already collapsed on " + response.getHits().getCollapseField()
+                );
+            }
+            Map<String, SearchHit> collapsedHits = new LinkedHashMap<>();
+            List<Object> collapseValues = new ArrayList<>();
+            for (SearchHit hit : response.getHits()) {
+                Object fieldValue = null;
+                DocumentField docField = hit.getFields().get(collapseField);
+                if (docField != null) {
+                    if (docField.getValues().size() > 1) {
+                        throw new IllegalStateException(
+                            "Failed to collapse " + hit.getId() + ": doc has multiple values for field " + collapseField
+                        );
+                    }
+                    fieldValue = docField.getValues().get(0);
+                } else if (hit.getSourceAsMap() != null) {
+                    fieldValue = hit.getSourceAsMap().get(collapseField);
+                }
+                String fieldValueString;
+                if (fieldValue == null) {
+                    fieldValueString = "__missing__";
+                } else {
+                    fieldValueString = fieldValue.toString();
+                }
+
+                // Results are already sorted by sort criterion. Only keep the first hit for each field.
+                if (collapsedHits.containsKey(fieldValueString) == false) {
+                    collapsedHits.put(fieldValueString, hit);
+                    collapseValues.add(fieldValue);
+                }
+            }
+            SearchHit[] newHits = new SearchHit[collapsedHits.size()];
+            int i = 0;
+            for (SearchHit collapsedHit : collapsedHits.values()) {
+                newHits[i++] = collapsedHit;
+            }
+            SearchHits searchHits = new SearchHits(
+                newHits,
+                response.getHits().getTotalHits(),
+                response.getHits().getMaxScore(),
+                response.getHits().getSortFields(),
+                collapseField,
+                collapseValues.toArray()
+            );
+            return SearchResponseUtil.replaceHits(searchHits, response);
+        }
+        return response;
+    }
+
+    static class Factory implements Processor.Factory<SearchResponseProcessor> {
+
+        @Override
+        public CollapseResponseProcessor create(
+            Map<String, Processor.Factory<SearchResponseProcessor>> processorFactories,
+            String tag,
+            String description,
+            boolean ignoreFailure,
+            Map<String, Object> config,
+            PipelineContext pipelineContext
+        ) {
+            String collapseField = ConfigurationUtils.readStringProperty(TYPE, tag, config, COLLAPSE_FIELD);
+            return new CollapseResponseProcessor(tag, description, ignoreFailure, collapseField);
+        }
+    }
+
+}
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/OversampleRequestProcessor.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/OversampleRequestProcessor.java
new file mode 100644
index 0000000000000..182cf6ba79504
--- /dev/null
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/OversampleRequestProcessor.java
@@ -0,0 +1,83 @@
+/*
+ * 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.search.pipeline.common;
+
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.ingest.ConfigurationUtils;
+import org.opensearch.search.SearchService;
+import org.opensearch.search.pipeline.AbstractProcessor;
+import org.opensearch.search.pipeline.PipelineProcessingContext;
+import org.opensearch.search.pipeline.Processor;
+import org.opensearch.search.pipeline.SearchRequestProcessor;
+import org.opensearch.search.pipeline.StatefulSearchRequestProcessor;
+import org.opensearch.search.pipeline.common.helpers.ContextUtils;
+
+import java.util.Map;
+
+import static org.opensearch.search.pipeline.common.helpers.ContextUtils.applyContextPrefix;
+
+/**
+ * Multiplies the "size" parameter on the {@link SearchRequest} by the given scaling factor, storing the original value
+ * in the request context as "original_size".
+ */
+public class OversampleRequestProcessor extends AbstractProcessor implements StatefulSearchRequestProcessor {
+
+    /**
+     * Key to reference this processor type from a search pipeline.
+     */
+    public static final String TYPE = "oversample";
+    static final String SAMPLE_FACTOR = "sample_factor";
+    static final String ORIGINAL_SIZE = "original_size";
+    private final double sampleFactor;
+    private final String contextPrefix;
+
+    private OversampleRequestProcessor(String tag, String description, boolean ignoreFailure, double sampleFactor, String contextPrefix) {
+        super(tag, description, ignoreFailure);
+        this.sampleFactor = sampleFactor;
+        this.contextPrefix = contextPrefix;
+    }
+
+    @Override
+    public SearchRequest processRequest(SearchRequest request, PipelineProcessingContext requestContext) {
+        if (request.source() != null) {
+            int originalSize = request.source().size();
+            if (originalSize == -1) {
+                originalSize = SearchService.DEFAULT_SIZE;
+            }
+            requestContext.setAttribute(applyContextPrefix(contextPrefix, ORIGINAL_SIZE), originalSize);
+            int newSize = (int) Math.ceil(originalSize * sampleFactor);
+            request.source().size(newSize);
+        }
+        return request;
+    }
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    static class Factory implements Processor.Factory<SearchRequestProcessor> {
+        @Override
+        public OversampleRequestProcessor create(
+            Map<String, Processor.Factory<SearchRequestProcessor>> processorFactories,
+            String tag,
+            String description,
+            boolean ignoreFailure,
+            Map<String, Object> config,
+            PipelineContext pipelineContext
+        ) {
+            double sampleFactor = ConfigurationUtils.readDoubleProperty(TYPE, tag, config, SAMPLE_FACTOR);
+            if (sampleFactor < 1.0) {
+                throw ConfigurationUtils.newConfigurationException(TYPE, tag, SAMPLE_FACTOR, "Value must be >= 1.0");
+            }
+            String contextPrefix = ConfigurationUtils.readOptionalStringProperty(TYPE, tag, config, ContextUtils.CONTEXT_PREFIX_PARAMETER);
+            return new OversampleRequestProcessor(tag, description, ignoreFailure, sampleFactor, contextPrefix);
+        }
+    }
+}
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/ScriptRequestProcessor.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/ScriptRequestProcessor.java
index 90f71fd1754e4..a4052d0892ee6 100644
--- a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/ScriptRequestProcessor.java
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/ScriptRequestProcessor.java
@@ -23,9 +23,10 @@
 import org.opensearch.script.ScriptType;
 import org.opensearch.script.SearchScript;
 import org.opensearch.search.pipeline.AbstractProcessor;
+import org.opensearch.search.pipeline.PipelineProcessingContext;
 import org.opensearch.search.pipeline.Processor;
 import org.opensearch.search.pipeline.SearchRequestProcessor;
-import org.opensearch.search.pipeline.common.helpers.SearchRequestMap;
+import org.opensearch.search.pipeline.StatefulSearchRequestProcessor;
 
 import java.io.InputStream;
 import java.util.HashMap;
@@ -38,7 +39,7 @@
  * Processor that evaluates a script with a search request in its context
  * and then returns the modified search request.
  */
-public final class ScriptRequestProcessor extends AbstractProcessor implements SearchRequestProcessor {
+public final class ScriptRequestProcessor extends AbstractProcessor implements StatefulSearchRequestProcessor {
     /**
      * Key to reference this processor type from a search pipeline.
      */
@@ -72,15 +73,8 @@ public final class ScriptRequestProcessor extends AbstractProcessor implements S
         this.scriptService = scriptService;
     }
 
-    /**
-     * Executes the script with the search request in context.
-     *
-     * @param request The search request passed into the script context.
-     * @return The modified search request.
-     * @throws Exception if an error occurs while processing the request.
-     */
     @Override
-    public SearchRequest processRequest(SearchRequest request) throws Exception {
+    public SearchRequest processRequest(SearchRequest request, PipelineProcessingContext requestContext) throws Exception {
         // assert request is not null and source is not null
         if (request == null || request.source() == null) {
             throw new IllegalArgumentException("search request must not be null");
@@ -93,10 +87,33 @@ public SearchRequest processRequest(SearchRequest request) throws Exception {
             searchScript = precompiledSearchScript;
         }
         // execute the script with the search request in context
-        searchScript.execute(Map.of("_source", new SearchRequestMap(request)));
+        searchScript.execute(Map.of("_source", new SearchRequestMap(request), "request_context", new RequestContextMap(requestContext)));
         return request;
     }
 
+    private static class RequestContextMap extends BasicMap {
+        private final PipelineProcessingContext pipelinedRequestContext;
+
+        private RequestContextMap(PipelineProcessingContext pipelinedRequestContext) {
+            this.pipelinedRequestContext = pipelinedRequestContext;
+        }
+
+        @Override
+        public Object get(Object key) {
+            if (key instanceof String) {
+                return pipelinedRequestContext.getAttribute(key.toString());
+            }
+            return null;
+        }
+
+        @Override
+        public Object put(String key, Object value) {
+            Object originalValue = get(key);
+            pipelinedRequestContext.setAttribute(key, value);
+            return originalValue;
+        }
+    }
+
     /**
      * Returns the type of the processor.
      *
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchPipelineCommonModulePlugin.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchPipelineCommonModulePlugin.java
index 49681b80fdead..5378a6721efb2 100644
--- a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchPipelineCommonModulePlugin.java
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchPipelineCommonModulePlugin.java
@@ -38,12 +38,21 @@ public Map<String, Processor.Factory<SearchRequestProcessor>> getRequestProcesso
             FilterQueryRequestProcessor.TYPE,
             new FilterQueryRequestProcessor.Factory(parameters.namedXContentRegistry),
             ScriptRequestProcessor.TYPE,
-            new ScriptRequestProcessor.Factory(parameters.scriptService)
+            new ScriptRequestProcessor.Factory(parameters.scriptService),
+            OversampleRequestProcessor.TYPE,
+            new OversampleRequestProcessor.Factory()
         );
     }
 
     @Override
     public Map<String, Processor.Factory<SearchResponseProcessor>> getResponseProcessors(Parameters parameters) {
-        return Map.of(RenameFieldResponseProcessor.TYPE, new RenameFieldResponseProcessor.Factory());
+        return Map.of(
+            RenameFieldResponseProcessor.TYPE,
+            new RenameFieldResponseProcessor.Factory(),
+            TruncateHitsResponseProcessor.TYPE,
+            new TruncateHitsResponseProcessor.Factory(),
+            CollapseResponseProcessor.TYPE,
+            new CollapseResponseProcessor.Factory()
+        );
     }
 }
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchRequestMap.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchRequestMap.java
new file mode 100644
index 0000000000000..c6430b96dcbed
--- /dev/null
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchRequestMap.java
@@ -0,0 +1,140 @@
+/*
+ * 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.search.pipeline.common;
+
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.search.builder.SearchSourceBuilder;
+
+import java.util.Map;
+
+/**
+ * A custom implementation of {@link Map} that provides access to the properties of a {@link SearchRequest}'s
+ * {@link SearchSourceBuilder}. The class allows retrieving and modifying specific properties of the search request.
+ */
+class SearchRequestMap extends BasicMap implements Map<String, Object> {
+
+    private final SearchSourceBuilder source;
+
+    /**
+     * Constructs a new instance of the {@link SearchRequestMap} with the provided {@link SearchRequest}.
+     *
+     * @param searchRequest The SearchRequest containing the SearchSourceBuilder to be accessed.
+     */
+    public SearchRequestMap(SearchRequest searchRequest) {
+        source = searchRequest.source();
+    }
+
+    /**
+     * Checks if the SearchSourceBuilder is empty.
+     *
+     * @return {@code true} if the SearchSourceBuilder is empty, {@code false} otherwise.
+     */
+    @Override
+    public boolean isEmpty() {
+        return source == null;
+    }
+
+    /**
+     * Retrieves the value associated with the specified property from the SearchSourceBuilder.
+     *
+     * @param key The SearchSourceBuilder property whose value is to be retrieved.
+     * @return The value associated with the specified property or null if the property has not been initialized.
+     * @throws IllegalArgumentException if the property name is not a String.
+     * @throws SearchRequestMapProcessingException if the property is not supported.
+     */
+    @Override
+    public Object get(Object key) {
+        if (!(key instanceof String)) {
+            throw new IllegalArgumentException("key must be a String");
+        }
+        // This is the explicit implementation of fetch value from source
+        switch ((String) key) {
+            case "from":
+                return source.from();
+            case "size":
+                return source.size();
+            case "explain":
+                return source.explain();
+            case "version":
+                return source.version();
+            case "seq_no_primary_term":
+                return source.seqNoAndPrimaryTerm();
+            case "track_scores":
+                return source.trackScores();
+            case "track_total_hits":
+                return source.trackTotalHitsUpTo();
+            case "min_score":
+                return source.minScore();
+            case "terminate_after":
+                return source.terminateAfter();
+            case "profile":
+                return source.profile();
+            default:
+                throw new SearchRequestMapProcessingException("Unsupported key: " + key);
+        }
+    }
+
+    /**
+     * Sets the value for the specified property in the SearchSourceBuilder.
+     *
+     * @param key The property whose value is to be set.
+     * @param value The value to be set for the specified property.
+     * @return The original value associated with the property, or null if none existed.
+     * @throws IllegalArgumentException if the property is not a String.
+     * @throws SearchRequestMapProcessingException if the property is not supported or an error occurs during the setting.
+     */
+    @Override
+    public Object put(String key, Object value) {
+        Object originalValue = get(key);
+        try {
+            switch (key) {
+                case "from":
+                    source.from((Integer) value);
+                    break;
+                case "size":
+                    source.size((Integer) value);
+                    break;
+                case "explain":
+                    source.explain((Boolean) value);
+                    break;
+                case "version":
+                    source.version((Boolean) value);
+                    break;
+                case "seq_no_primary_term":
+                    source.seqNoAndPrimaryTerm((Boolean) value);
+                    break;
+                case "track_scores":
+                    source.trackScores((Boolean) value);
+                    break;
+                case "track_total_hits":
+                    source.trackTotalHitsUpTo((Integer) value);
+                    break;
+                case "min_score":
+                    source.minScore((Float) value);
+                    break;
+                case "terminate_after":
+                    source.terminateAfter((Integer) value);
+                    break;
+                case "profile":
+                    source.profile((Boolean) value);
+                    break;
+                case "stats": // Not modifying stats, sorts, docvalue_fields, etc. as they require more complex handling
+                case "sort":
+                case "timeout":
+                case "docvalue_fields":
+                case "indices_boost":
+                default:
+                    throw new SearchRequestMapProcessingException("Unsupported SearchRequest source property: " + key);
+            }
+        } catch (Exception e) {
+            throw new SearchRequestMapProcessingException("Error while setting value for SearchRequest source property: " + key, e);
+        }
+        return originalValue;
+    }
+}
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMapProcessingException.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchRequestMapProcessingException.java
similarity index 76%
rename from modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMapProcessingException.java
rename to modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchRequestMapProcessingException.java
index cb1e45a20b624..2f00d0f82c2f1 100644
--- a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMapProcessingException.java
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/SearchRequestMapProcessingException.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.search.pipeline.common.helpers;
+package org.opensearch.search.pipeline.common;
 
 import org.opensearch.OpenSearchException;
 import org.opensearch.OpenSearchWrapperException;
@@ -14,12 +14,12 @@
 /**
  * An exception that indicates an error occurred while processing a {@link SearchRequestMap}.
  */
-public class SearchRequestMapProcessingException extends OpenSearchException implements OpenSearchWrapperException {
+class SearchRequestMapProcessingException extends OpenSearchException implements OpenSearchWrapperException {
 
     /**
      * Constructs a new SearchRequestMapProcessingException with the specified message.
      *
-     * @param msg The error message.
+     * @param msg  The error message.
      * @param args Arguments to substitute in the error message.
      */
     public SearchRequestMapProcessingException(String msg, Object... args) {
@@ -29,9 +29,9 @@ public SearchRequestMapProcessingException(String msg, Object... args) {
     /**
      * Constructs a new SearchRequestMapProcessingException with the specified message and cause.
      *
-     * @param msg The error message.
+     * @param msg   The error message.
      * @param cause The cause of the exception.
-     * @param args Arguments to substitute in the error message.
+     * @param args  Arguments to substitute in the error message.
      */
     public SearchRequestMapProcessingException(String msg, Throwable cause, Object... args) {
         super(msg, cause, args);
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/TruncateHitsResponseProcessor.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/TruncateHitsResponseProcessor.java
new file mode 100644
index 0000000000000..e3413bf41720f
--- /dev/null
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/TruncateHitsResponseProcessor.java
@@ -0,0 +1,96 @@
+/*
+ * 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.search.pipeline.common;
+
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.ingest.ConfigurationUtils;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.pipeline.AbstractProcessor;
+import org.opensearch.search.pipeline.PipelineProcessingContext;
+import org.opensearch.search.pipeline.Processor;
+import org.opensearch.search.pipeline.SearchResponseProcessor;
+import org.opensearch.search.pipeline.StatefulSearchResponseProcessor;
+import org.opensearch.search.pipeline.common.helpers.ContextUtils;
+import org.opensearch.search.pipeline.common.helpers.SearchResponseUtil;
+
+import java.util.Map;
+
+import static org.opensearch.search.pipeline.common.helpers.ContextUtils.applyContextPrefix;
+
+/**
+ * Truncates the returned search hits from the {@link SearchResponse}. If no target size is specified in the pipeline, then
+ * we try using the "original_size" value from the request context, which may have been set by {@link OversampleRequestProcessor}.
+ */
+public class TruncateHitsResponseProcessor extends AbstractProcessor implements StatefulSearchResponseProcessor {
+    /**
+     * Key to reference this processor type from a search pipeline.
+     */
+    public static final String TYPE = "truncate_hits";
+    static final String TARGET_SIZE = "target_size";
+    private final int targetSize;
+    private final String contextPrefix;
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    private TruncateHitsResponseProcessor(String tag, String description, boolean ignoreFailure, int targetSize, String contextPrefix) {
+        super(tag, description, ignoreFailure);
+        this.targetSize = targetSize;
+        this.contextPrefix = contextPrefix;
+    }
+
+    @Override
+    public SearchResponse processResponse(SearchRequest request, SearchResponse response, PipelineProcessingContext requestContext) {
+        int size;
+        if (targetSize < 0) { // No value specified in processor config. Use context value instead.
+            String key = applyContextPrefix(contextPrefix, OversampleRequestProcessor.ORIGINAL_SIZE);
+            Object o = requestContext.getAttribute(key);
+            if (o == null) {
+                throw new IllegalStateException("Must specify " + TARGET_SIZE + " unless an earlier processor set " + key);
+            }
+            size = (int) o;
+        } else {
+            size = targetSize;
+        }
+        if (response.getHits() != null && response.getHits().getHits().length > size) {
+            SearchHit[] newHits = new SearchHit[size];
+            System.arraycopy(response.getHits().getHits(), 0, newHits, 0, size);
+            return SearchResponseUtil.replaceHits(newHits, response);
+        }
+        return response;
+    }
+
+    static class Factory implements Processor.Factory<SearchResponseProcessor> {
+        @Override
+        public TruncateHitsResponseProcessor create(
+            Map<String, Processor.Factory<SearchResponseProcessor>> processorFactories,
+            String tag,
+            String description,
+            boolean ignoreFailure,
+            Map<String, Object> config,
+            PipelineContext pipelineContext
+        ) {
+            Integer targetSize = ConfigurationUtils.readIntProperty(TYPE, tag, config, TARGET_SIZE, null);
+            if (targetSize == null) {
+                // Use -1 as an "unset" marker to avoid repeated unboxing of an Integer.
+                targetSize = -1;
+            } else {
+                // Explicitly set values must be >= 0.
+                if (targetSize < 0) {
+                    throw ConfigurationUtils.newConfigurationException(TYPE, tag, TARGET_SIZE, "Value must be >= 0");
+                }
+            }
+            String contextPrefix = ConfigurationUtils.readOptionalStringProperty(TYPE, tag, config, ContextUtils.CONTEXT_PREFIX_PARAMETER);
+            return new TruncateHitsResponseProcessor(tag, description, ignoreFailure, targetSize, contextPrefix);
+        }
+    }
+}
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/ContextUtils.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/ContextUtils.java
new file mode 100644
index 0000000000000..9697da85dbecf
--- /dev/null
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/ContextUtils.java
@@ -0,0 +1,38 @@
+/*
+ * 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.search.pipeline.common.helpers;
+
+/**
+ * Helpers for working with request-scoped context.
+ */
+public final class ContextUtils {
+    private ContextUtils() {}
+
+    /**
+     * Parameter that can be passed to a stateful processor to avoid collisions between contextual variables by
+     * prefixing them with distinct qualifiers.
+     */
+    public static final String CONTEXT_PREFIX_PARAMETER = "context_prefix";
+
+    /**
+     * Replaces a "global" variable name with one scoped to a given context prefix (unless prefix is null or empty).
+     * @param contextPrefix the prefix qualifier for the variable
+     * @param variableName the generic "global" form of the context variable
+     * @return the variableName prefixed with contextPrefix followed by ".", or just variableName if contextPrefix is null or empty
+     */
+    public static String applyContextPrefix(String contextPrefix, String variableName) {
+        String contextVariable;
+        if (contextPrefix != null && contextPrefix.isEmpty() == false) {
+            contextVariable = contextPrefix + "." + variableName;
+        } else {
+            contextVariable = variableName;
+        }
+        return contextVariable;
+    }
+}
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMap.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMap.java
deleted file mode 100644
index 7af3ac66be146..0000000000000
--- a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMap.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * 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.search.pipeline.common.helpers;
-
-import org.opensearch.action.search.SearchRequest;
-import org.opensearch.search.builder.SearchSourceBuilder;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-/**
- * A custom implementation of {@link Map} that provides access to the properties of a {@link SearchRequest}'s
- * {@link SearchSourceBuilder}. The class allows retrieving and modifying specific properties of the search request.
- */
-public class SearchRequestMap implements Map<String, Object> {
-    private static final String UNSUPPORTED_OP_ERR = " Method not supported in Search pipeline script";
-
-    private final SearchSourceBuilder source;
-
-    /**
-     * Constructs a new instance of the {@link SearchRequestMap} with the provided {@link SearchRequest}.
-     *
-     * @param searchRequest The SearchRequest containing the SearchSourceBuilder to be accessed.
-     */
-    public SearchRequestMap(SearchRequest searchRequest) {
-        source = searchRequest.source();
-    }
-
-    /**
-     * Retrieves the number of properties in the SearchSourceBuilder.
-     *
-     * @return The number of properties in the SearchSourceBuilder.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public int size() {
-        throw new UnsupportedOperationException("size" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Checks if the SearchSourceBuilder is empty.
-     *
-     * @return {@code true} if the SearchSourceBuilder is empty, {@code false} otherwise.
-     */
-    @Override
-    public boolean isEmpty() {
-        return source == null;
-    }
-
-    /**
-     * Checks if the SearchSourceBuilder contains the specified property.
-     *
-     * @param key The property to check for.
-     * @return {@code true} if the SearchSourceBuilder contains the specified property, {@code false} otherwise.
-     */
-    @Override
-    public boolean containsKey(Object key) {
-        return get(key) != null;
-    }
-
-    /**
-     * Checks if the SearchSourceBuilder contains the specified value.
-     *
-     * @param value The value to check for.
-     * @return {@code true} if the SearchSourceBuilder contains the specified value, {@code false} otherwise.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public boolean containsValue(Object value) {
-        throw new UnsupportedOperationException("containsValue" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Retrieves the value associated with the specified property from the SearchSourceBuilder.
-     *
-     * @param key The SearchSourceBuilder property whose value is to be retrieved.
-     * @return The value associated with the specified property or null if the property has not been initialized.
-     * @throws IllegalArgumentException if the property name is not a String.
-     * @throws SearchRequestMapProcessingException if the property is not supported.
-     */
-    @Override
-    public Object get(Object key) {
-        if (!(key instanceof String)) {
-            throw new IllegalArgumentException("key must be a String");
-        }
-        // This is the explicit implementation of fetch value from source
-        switch ((String) key) {
-            case "from":
-                return source.from();
-            case "size":
-                return source.size();
-            case "explain":
-                return source.explain();
-            case "version":
-                return source.version();
-            case "seq_no_primary_term":
-                return source.seqNoAndPrimaryTerm();
-            case "track_scores":
-                return source.trackScores();
-            case "track_total_hits":
-                return source.trackTotalHitsUpTo();
-            case "min_score":
-                return source.minScore();
-            case "terminate_after":
-                return source.terminateAfter();
-            case "profile":
-                return source.profile();
-            default:
-                throw new SearchRequestMapProcessingException("Unsupported key: " + key);
-        }
-    }
-
-    /**
-     * Sets the value for the specified property in the SearchSourceBuilder.
-     *
-     * @param key The property whose value is to be set.
-     * @param value The value to be set for the specified property.
-     * @return The original value associated with the property, or null if none existed.
-     * @throws IllegalArgumentException if the property is not a String.
-     * @throws SearchRequestMapProcessingException if the property is not supported or an error occurs during the setting.
-     */
-    @Override
-    public Object put(String key, Object value) {
-        Object originalValue = get(key);
-        try {
-            switch (key) {
-                case "from":
-                    source.from((Integer) value);
-                    break;
-                case "size":
-                    source.size((Integer) value);
-                    break;
-                case "explain":
-                    source.explain((Boolean) value);
-                    break;
-                case "version":
-                    source.version((Boolean) value);
-                    break;
-                case "seq_no_primary_term":
-                    source.seqNoAndPrimaryTerm((Boolean) value);
-                    break;
-                case "track_scores":
-                    source.trackScores((Boolean) value);
-                    break;
-                case "track_total_hits":
-                    source.trackTotalHitsUpTo((Integer) value);
-                    break;
-                case "min_score":
-                    source.minScore((Float) value);
-                    break;
-                case "terminate_after":
-                    source.terminateAfter((Integer) value);
-                    break;
-                case "profile":
-                    source.profile((Boolean) value);
-                    break;
-                case "stats": // Not modifying stats, sorts, docvalue_fields, etc. as they require more complex handling
-                case "sort":
-                case "timeout":
-                case "docvalue_fields":
-                case "indices_boost":
-                default:
-                    throw new SearchRequestMapProcessingException("Unsupported SearchRequest source property: " + key);
-            }
-        } catch (Exception e) {
-            throw new SearchRequestMapProcessingException("Error while setting value for SearchRequest source property: " + key, e);
-        }
-        return originalValue;
-    }
-
-    /**
-     * Removes the specified property from the SearchSourceBuilder.
-     *
-     * @param key The name of the property that will be removed.
-     * @return The value associated with the property before it was removed, or null if the property was not found.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Object remove(Object key) {
-        throw new UnsupportedOperationException("remove" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Sets all the properties from the specified map to the SearchSourceBuilder.
-     *
-     * @param m The map containing the properties to be set.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public void putAll(Map<? extends String, ?> m) {
-        throw new UnsupportedOperationException("putAll" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Removes all properties from the SearchSourceBuilder.
-     *
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public void clear() {
-        throw new UnsupportedOperationException("clear" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Returns a set view of the property names in the SearchSourceBuilder.
-     *
-     * @return A set view of the property names in the SearchSourceBuilder.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Set<String> keySet() {
-        throw new UnsupportedOperationException("keySet" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Returns a collection view of the property values in the SearchSourceBuilder.
-     *
-     * @return A collection view of the property values in the SearchSourceBuilder.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Collection<Object> values() {
-        throw new UnsupportedOperationException("values" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Returns a set view of the properties in the SearchSourceBuilder.
-     *
-     * @return A set view of the properties in the SearchSourceBuilder.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Set<Entry<String, Object>> entrySet() {
-        throw new UnsupportedOperationException("entrySet" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Returns the value to which the specified property has, or the defaultValue if the property is not present in the
-     * SearchSourceBuilder.
-     *
-     * @param key The property whose associated value is to be returned.
-     * @param defaultValue The default value to be returned if the property is not present.
-     * @return The value to which the specified property has, or the defaultValue if the property is not present.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Object getOrDefault(Object key, Object defaultValue) {
-        throw new UnsupportedOperationException("getOrDefault" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Performs the given action for each property in the SearchSourceBuilder until all properties have been processed or the
-     * action throws an exception
-     *
-     * @param action The action to be performed for each property.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public void forEach(BiConsumer<? super String, ? super Object> action) {
-        throw new UnsupportedOperationException("forEach" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Replaces each property's value with the result of invoking the given function on that property until all properties have
-     * been processed or the function throws an exception.
-     *
-     * @param function The function to apply to each property.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public void replaceAll(BiFunction<? super String, ? super Object, ?> function) {
-        throw new UnsupportedOperationException("replaceAll" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * If the specified property is not already associated with a value, associates it with the given value and returns null,
-     * else returns the current value.
-     *
-     * @param key The property whose value is to be set if absent.
-     * @param value The value to be associated with the specified property.
-     * @return The current value associated with the property, or null if the property is not present.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Object putIfAbsent(String key, Object value) {
-        throw new UnsupportedOperationException("putIfAbsent" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Removes the property only if it has the given value.
-     *
-     * @param key The property to be removed.
-     * @param value The value expected to be associated with the property.
-     * @return {@code true} if the entry was removed, {@code false} otherwise.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public boolean remove(Object key, Object value) {
-        throw new UnsupportedOperationException("remove" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Replaces the specified property only if it has the given value.
-     *
-     * @param key The property to be replaced.
-     * @param oldValue The value expected to be associated with the property.
-     * @param newValue The value to be associated with the property.
-     * @return {@code true} if the property was replaced, {@code false} otherwise.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public boolean replace(String key, Object oldValue, Object newValue) {
-        throw new UnsupportedOperationException("replace" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * Replaces the specified property only if it has the given value.
-     *
-     * @param key The property to be replaced.
-     * @param value The value to be associated with the property.
-     * @return The previous value associated with the property, or null if the property was not found.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Object replace(String key, Object value) {
-        throw new UnsupportedOperationException("replace" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * The computed value associated with the property, or null if the property is not present.
-     *
-     * @param key The property whose value is to be computed if absent.
-     * @param mappingFunction The function to compute a value based on the property.
-     * @return The computed value associated with the property, or null if the property is not present.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Object computeIfAbsent(String key, Function<? super String, ?> mappingFunction) {
-        throw new UnsupportedOperationException("computeIfAbsent" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * If the value for the specified property is present, attempts to compute a new mapping given the property and its current
-     * mapped value.
-     *
-     * @param key The property for which the mapping is to be computed.
-     * @param remappingFunction The function to compute a new mapping.
-     * @return The new value associated with the property, or null if the property is not present.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Object computeIfPresent(String key, BiFunction<? super String, ? super Object, ?> remappingFunction) {
-        throw new UnsupportedOperationException("computeIfPresent" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * If the value for the specified property is present, attempts to compute a new mapping given the property and its current
-     * mapped value, or removes the property if the computed value is null.
-     *
-     * @param key The property for which the mapping is to be computed.
-     * @param remappingFunction The function to compute a new mapping.
-     * @return The new value associated with the property, or null if the property is not present.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Object compute(String key, BiFunction<? super String, ? super Object, ?> remappingFunction) {
-        throw new UnsupportedOperationException("compute" + UNSUPPORTED_OP_ERR);
-    }
-
-    /**
-     * If the specified property is not already associated with a value or is associated with null, associates it with the
-     * given non-null value. Otherwise, replaces the associated value with the results of applying the given
-     * remapping function to the current and new values.
-     *
-     * @param key The property for which the mapping is to be merged.
-     * @param value The non-null value to be merged with the existing value.
-     * @param remappingFunction The function to merge the existing and new values.
-     * @return The new value associated with the property, or null if the property is not present.
-     * @throws UnsupportedOperationException always, as the method is not supported.
-     */
-    @Override
-    public Object merge(String key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {
-        throw new UnsupportedOperationException("merge" + UNSUPPORTED_OP_ERR);
-    }
-}
diff --git a/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchResponseUtil.java b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchResponseUtil.java
new file mode 100644
index 0000000000000..0710548c6429f
--- /dev/null
+++ b/modules/search-pipeline-common/src/main/java/org/opensearch/search/pipeline/common/helpers/SearchResponseUtil.java
@@ -0,0 +1,93 @@
+/*
+ * 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.search.pipeline.common.helpers;
+
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.search.SearchResponseSections;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.aggregations.InternalAggregations;
+import org.opensearch.search.internal.InternalSearchResponse;
+import org.opensearch.search.profile.SearchProfileShardResults;
+
+/**
+ * Helper methods for manipulating {@link SearchResponse}.
+ */
+public final class SearchResponseUtil {
+    private SearchResponseUtil() {
+
+    }
+
+    /**
+     * Construct a new {@link SearchResponse} based on an existing one, replacing just the {@link SearchHits}.
+     * @param newHits new {@link SearchHits}
+     * @param response the existing search response
+     * @return a new search response where the {@link SearchHits} has been replaced
+     */
+    public static SearchResponse replaceHits(SearchHits newHits, SearchResponse response) {
+        SearchResponseSections searchResponseSections;
+        if (response.getAggregations() == null || response.getAggregations() instanceof InternalAggregations) {
+            // We either have no aggregations, or we have Writeable InternalAggregations.
+            // Either way, we can produce a Writeable InternalSearchResponse.
+            searchResponseSections = new InternalSearchResponse(
+                newHits,
+                (InternalAggregations) response.getAggregations(),
+                response.getSuggest(),
+                new SearchProfileShardResults(response.getProfileResults()),
+                response.isTimedOut(),
+                response.isTerminatedEarly(),
+                response.getNumReducePhases()
+            );
+        } else {
+            // We have non-Writeable Aggregations, so the whole SearchResponseSections is non-Writeable.
+            searchResponseSections = new SearchResponseSections(
+                newHits,
+                response.getAggregations(),
+                response.getSuggest(),
+                response.isTimedOut(),
+                response.isTerminatedEarly(),
+                new SearchProfileShardResults(response.getProfileResults()),
+                response.getNumReducePhases()
+            );
+        }
+
+        return new SearchResponse(
+            searchResponseSections,
+            response.getScrollId(),
+            response.getTotalShards(),
+            response.getSuccessfulShards(),
+            response.getSkippedShards(),
+            response.getTook().millis(),
+            response.getShardFailures(),
+            response.getClusters(),
+            response.pointInTimeId()
+        );
+    }
+
+    /**
+     * Convenience method when only replacing the {@link SearchHit} array within the {@link SearchHits} in a {@link SearchResponse}.
+     * @param newHits the new array of {@link SearchHit} elements.
+     * @param response the search response to update
+     * @return a {@link SearchResponse} where the underlying array of {@link SearchHit} within the {@link SearchHits} has been replaced.
+     */
+    public static SearchResponse replaceHits(SearchHit[] newHits, SearchResponse response) {
+        if (response.getHits() == null) {
+            throw new IllegalStateException("Response must have hits");
+        }
+        SearchHits searchHits = new SearchHits(
+            newHits,
+            response.getHits().getTotalHits(),
+            response.getHits().getMaxScore(),
+            response.getHits().getSortFields(),
+            response.getHits().getCollapseField(),
+            response.getHits().getCollapseValues()
+        );
+        return replaceHits(searchHits, response);
+    }
+}
diff --git a/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/CollapseResponseProcessorTests.java b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/CollapseResponseProcessorTests.java
new file mode 100644
index 0000000000000..cda011f24fea1
--- /dev/null
+++ b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/CollapseResponseProcessorTests.java
@@ -0,0 +1,86 @@
+/*
+ * 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.search.pipeline.common;
+
+import org.apache.lucene.search.TotalHits;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.common.document.DocumentField;
+import org.opensearch.core.common.bytes.BytesArray;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.internal.InternalSearchResponse;
+import org.opensearch.test.OpenSearchTestCase;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class CollapseResponseProcessorTests extends OpenSearchTestCase {
+    public void testWithDocumentFields() {
+        testProcessor(true);
+    }
+
+    public void testWithSourceField() {
+        testProcessor(false);
+    }
+
+    private void testProcessor(boolean includeDocField) {
+        Map<String, Object> config = new HashMap<>(Map.of(CollapseResponseProcessor.COLLAPSE_FIELD, "groupid"));
+        CollapseResponseProcessor processor = new CollapseResponseProcessor.Factory().create(
+            Collections.emptyMap(),
+            null,
+            null,
+            false,
+            config,
+            null
+        );
+        int numHits = randomIntBetween(1, 100);
+        SearchResponse inputResponse = generateResponse(numHits, includeDocField);
+
+        SearchResponse processedResponse = processor.processResponse(new SearchRequest(), inputResponse);
+        if (numHits % 2 == 0) {
+            assertEquals(numHits / 2, processedResponse.getHits().getHits().length);
+        } else {
+            assertEquals(numHits / 2 + 1, processedResponse.getHits().getHits().length);
+        }
+        for (SearchHit collapsedHit : processedResponse.getHits()) {
+            assertEquals(0, collapsedHit.docId() % 2);
+        }
+        assertEquals("groupid", processedResponse.getHits().getCollapseField());
+        assertEquals(processedResponse.getHits().getHits().length, processedResponse.getHits().getCollapseValues().length);
+        for (int i = 0; i < processedResponse.getHits().getHits().length; i++) {
+            assertEquals(i, processedResponse.getHits().getCollapseValues()[i]);
+        }
+    }
+
+    private static SearchResponse generateResponse(int numHits, boolean includeDocField) {
+        SearchHit[] hitsArray = new SearchHit[numHits];
+        for (int i = 0; i < numHits; i++) {
+            Map<String, DocumentField> docFields;
+            int groupValue = i / 2;
+            if (includeDocField) {
+                docFields = Map.of("groupid", new DocumentField("groupid", List.of(groupValue)));
+            } else {
+                docFields = Collections.emptyMap();
+            }
+            SearchHit hit = new SearchHit(i, Integer.toString(i), docFields, Collections.emptyMap());
+            hit.sourceRef(new BytesArray("{\"groupid\": " + groupValue + "}"));
+            hitsArray[i] = hit;
+        }
+        SearchHits searchHits = new SearchHits(
+            hitsArray,
+            new TotalHits(Math.max(numHits, 1000), TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO),
+            1.0f
+        );
+        InternalSearchResponse internalSearchResponse = new InternalSearchResponse(searchHits, null, null, null, false, false, 0);
+        return new SearchResponse(internalSearchResponse, null, 1, 1, 0, 10, null, null);
+    }
+}
diff --git a/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/OversampleRequestProcessorTests.java b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/OversampleRequestProcessorTests.java
new file mode 100644
index 0000000000000..96e99dff9cc03
--- /dev/null
+++ b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/OversampleRequestProcessorTests.java
@@ -0,0 +1,62 @@
+/*
+ * 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.search.pipeline.common;
+
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.search.pipeline.PipelineProcessingContext;
+import org.opensearch.search.pipeline.common.helpers.ContextUtils;
+import org.opensearch.test.OpenSearchTestCase;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class OversampleRequestProcessorTests extends OpenSearchTestCase {
+
+    public void testEmptySource() {
+        OversampleRequestProcessor.Factory factory = new OversampleRequestProcessor.Factory();
+        Map<String, Object> config = new HashMap<>(Map.of(OversampleRequestProcessor.SAMPLE_FACTOR, 3.0));
+        OversampleRequestProcessor processor = factory.create(Collections.emptyMap(), null, null, false, config, null);
+
+        SearchRequest request = new SearchRequest();
+        PipelineProcessingContext context = new PipelineProcessingContext();
+        SearchRequest transformedRequest = processor.processRequest(request, context);
+        assertEquals(request, transformedRequest);
+        assertNull(context.getAttribute("original_size"));
+    }
+
+    public void testBasicBehavior() {
+        OversampleRequestProcessor.Factory factory = new OversampleRequestProcessor.Factory();
+        Map<String, Object> config = new HashMap<>(Map.of(OversampleRequestProcessor.SAMPLE_FACTOR, 3.0));
+        OversampleRequestProcessor processor = factory.create(Collections.emptyMap(), null, null, false, config, null);
+
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().size(10);
+        SearchRequest request = new SearchRequest().source(sourceBuilder);
+        PipelineProcessingContext context = new PipelineProcessingContext();
+        SearchRequest transformedRequest = processor.processRequest(request, context);
+        assertEquals(30, transformedRequest.source().size());
+        assertEquals(10, context.getAttribute("original_size"));
+    }
+
+    public void testContextPrefix() {
+        OversampleRequestProcessor.Factory factory = new OversampleRequestProcessor.Factory();
+        Map<String, Object> config = new HashMap<>(
+            Map.of(OversampleRequestProcessor.SAMPLE_FACTOR, 3.0, ContextUtils.CONTEXT_PREFIX_PARAMETER, "foo")
+        );
+        OversampleRequestProcessor processor = factory.create(Collections.emptyMap(), null, null, false, config, null);
+
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().size(10);
+        SearchRequest request = new SearchRequest().source(sourceBuilder);
+        PipelineProcessingContext context = new PipelineProcessingContext();
+        SearchRequest transformedRequest = processor.processRequest(request, context);
+        assertEquals(30, transformedRequest.source().size());
+        assertEquals(10, context.getAttribute("foo.original_size"));
+    }
+}
diff --git a/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/ScriptRequestProcessorTests.java b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/ScriptRequestProcessorTests.java
index fde9757312e30..b372b220b71ac 100644
--- a/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/ScriptRequestProcessorTests.java
+++ b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/ScriptRequestProcessorTests.java
@@ -18,7 +18,7 @@
 import org.opensearch.script.ScriptType;
 import org.opensearch.script.SearchScript;
 import org.opensearch.search.builder.SearchSourceBuilder;
-import org.opensearch.search.pipeline.common.helpers.SearchRequestMap;
+import org.opensearch.search.pipeline.PipelineProcessingContext;
 import org.opensearch.test.OpenSearchTestCase;
 import org.junit.Before;
 
@@ -27,8 +27,6 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.core.Is.is;
-
 public class ScriptRequestProcessorTests extends OpenSearchTestCase {
 
     private ScriptService scriptService;
@@ -87,7 +85,7 @@ public void testScriptingWithoutPrecompiledScriptFactory() throws Exception {
         searchRequest.source(createSearchSourceBuilder());
 
         assertNotNull(searchRequest);
-        processor.processRequest(searchRequest);
+        processor.processRequest(searchRequest, new PipelineProcessingContext());
         assertSearchRequest(searchRequest);
     }
 
@@ -104,7 +102,7 @@ public void testScriptingWithPrecompiledIngestScript() throws Exception {
         searchRequest.source(createSearchSourceBuilder());
 
         assertNotNull(searchRequest);
-        processor.processRequest(searchRequest);
+        processor.processRequest(searchRequest, new PipelineProcessingContext());
         assertSearchRequest(searchRequest);
     }
 
@@ -124,15 +122,15 @@ private SearchSourceBuilder createSearchSourceBuilder() {
     }
 
     private void assertSearchRequest(SearchRequest searchRequest) {
-        assertThat(searchRequest.source().from(), is(20));
-        assertThat(searchRequest.source().size(), is(30));
-        assertThat(searchRequest.source().explain(), is(false));
-        assertThat(searchRequest.source().version(), is(false));
-        assertThat(searchRequest.source().seqNoAndPrimaryTerm(), is(false));
-        assertThat(searchRequest.source().trackScores(), is(false));
-        assertThat(searchRequest.source().trackTotalHitsUpTo(), is(4));
-        assertThat(searchRequest.source().minScore(), is(2.0f));
-        assertThat(searchRequest.source().timeout(), is(new TimeValue(60, TimeUnit.SECONDS)));
-        assertThat(searchRequest.source().terminateAfter(), is(6));
+        assertEquals(20, searchRequest.source().from());
+        assertEquals(30, searchRequest.source().size());
+        assertFalse(searchRequest.source().explain());
+        assertFalse(searchRequest.source().version());
+        assertFalse(searchRequest.source().seqNoAndPrimaryTerm());
+        assertFalse(searchRequest.source().trackScores());
+        assertEquals(4, searchRequest.source().trackTotalHitsUpTo().intValue());
+        assertEquals(2.0f, searchRequest.source().minScore(), 0.0001);
+        assertEquals(new TimeValue(60, TimeUnit.SECONDS), searchRequest.source().timeout());
+        assertEquals(6, searchRequest.source().terminateAfter());
     }
 }
diff --git a/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMapTests.java b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/SearchRequestMapTests.java
similarity index 99%
rename from modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMapTests.java
rename to modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/SearchRequestMapTests.java
index 5572f28335e1c..c982ada7b5ea5 100644
--- a/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/helpers/SearchRequestMapTests.java
+++ b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/SearchRequestMapTests.java
@@ -5,7 +5,7 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.search.pipeline.common.helpers;
+package org.opensearch.search.pipeline.common;
 
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.search.builder.SearchSourceBuilder;
diff --git a/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/TruncateHitsResponseProcessorTests.java b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/TruncateHitsResponseProcessorTests.java
new file mode 100644
index 0000000000000..7615225c7f77e
--- /dev/null
+++ b/modules/search-pipeline-common/src/test/java/org/opensearch/search/pipeline/common/TruncateHitsResponseProcessorTests.java
@@ -0,0 +1,91 @@
+/*
+ * 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.search.pipeline.common;
+
+import org.apache.lucene.search.TotalHits;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.internal.InternalSearchResponse;
+import org.opensearch.search.pipeline.PipelineProcessingContext;
+import org.opensearch.search.pipeline.common.helpers.ContextUtils;
+import org.opensearch.test.OpenSearchTestCase;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TruncateHitsResponseProcessorTests extends OpenSearchTestCase {
+
+    public void testBasicBehavior() {
+        int targetSize = randomInt(50);
+        TruncateHitsResponseProcessor.Factory factory = new TruncateHitsResponseProcessor.Factory();
+        Map<String, Object> config = new HashMap<>(Map.of(TruncateHitsResponseProcessor.TARGET_SIZE, targetSize));
+        TruncateHitsResponseProcessor processor = factory.create(Collections.emptyMap(), null, null, false, config, null);
+
+        int numHits = randomInt(100);
+        SearchResponse response = constructResponse(numHits);
+        SearchResponse transformedResponse = processor.processResponse(new SearchRequest(), response, new PipelineProcessingContext());
+        assertEquals(Math.min(targetSize, numHits), transformedResponse.getHits().getHits().length);
+    }
+
+    public void testTargetSizePassedViaContext() {
+        TruncateHitsResponseProcessor.Factory factory = new TruncateHitsResponseProcessor.Factory();
+        TruncateHitsResponseProcessor processor = factory.create(Collections.emptyMap(), null, null, false, Collections.emptyMap(), null);
+
+        int targetSize = randomInt(50);
+        int numHits = randomInt(100);
+        SearchResponse response = constructResponse(numHits);
+        PipelineProcessingContext requestContext = new PipelineProcessingContext();
+        requestContext.setAttribute("original_size", targetSize);
+        SearchResponse transformedResponse = processor.processResponse(new SearchRequest(), response, requestContext);
+        assertEquals(Math.min(targetSize, numHits), transformedResponse.getHits().getHits().length);
+    }
+
+    public void testTargetSizePassedViaContextWithPrefix() {
+        TruncateHitsResponseProcessor.Factory factory = new TruncateHitsResponseProcessor.Factory();
+        Map<String, Object> config = new HashMap<>(Map.of(ContextUtils.CONTEXT_PREFIX_PARAMETER, "foo"));
+        TruncateHitsResponseProcessor processor = factory.create(Collections.emptyMap(), null, null, false, config, null);
+
+        int targetSize = randomInt(50);
+        int numHits = randomInt(100);
+        SearchResponse response = constructResponse(numHits);
+        PipelineProcessingContext requestContext = new PipelineProcessingContext();
+        requestContext.setAttribute("foo.original_size", targetSize);
+        SearchResponse transformedResponse = processor.processResponse(new SearchRequest(), response, requestContext);
+        assertEquals(Math.min(targetSize, numHits), transformedResponse.getHits().getHits().length);
+    }
+
+    public void testTargetSizeMissing() {
+        TruncateHitsResponseProcessor.Factory factory = new TruncateHitsResponseProcessor.Factory();
+        TruncateHitsResponseProcessor processor = factory.create(Collections.emptyMap(), null, null, false, Collections.emptyMap(), null);
+
+        int numHits = randomInt(100);
+        SearchResponse response = constructResponse(numHits);
+        assertThrows(
+            IllegalStateException.class,
+            () -> processor.processResponse(new SearchRequest(), response, new PipelineProcessingContext())
+        );
+    }
+
+    private static SearchResponse constructResponse(int numHits) {
+        SearchHit[] hitsArray = new SearchHit[numHits];
+        for (int i = 0; i < numHits; i++) {
+            hitsArray[i] = new SearchHit(i, Integer.toString(i), Collections.emptyMap(), Collections.emptyMap());
+        }
+        SearchHits searchHits = new SearchHits(
+            hitsArray,
+            new TotalHits(Math.max(numHits, 1000), TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO),
+            1.0f
+        );
+        InternalSearchResponse internalSearchResponse = new InternalSearchResponse(searchHits, null, null, null, false, false, 0);
+        return new SearchResponse(internalSearchResponse, null, 1, 1, 0, 10, null, null);
+    }
+}
diff --git a/modules/search-pipeline-common/src/yamlRestTest/resources/rest-api-spec/test/search_pipeline/60_oversample_truncate.yml b/modules/search-pipeline-common/src/yamlRestTest/resources/rest-api-spec/test/search_pipeline/60_oversample_truncate.yml
new file mode 100644
index 0000000000000..1f9e95084322d
--- /dev/null
+++ b/modules/search-pipeline-common/src/yamlRestTest/resources/rest-api-spec/test/search_pipeline/60_oversample_truncate.yml
@@ -0,0 +1,105 @@
+---
+teardown:
+  - do:
+      search_pipeline.delete:
+        id: "my_pipeline"
+        ignore: 404
+
+---
+"Test state propagating from oversample to truncate_hits processor":
+  - do:
+      search_pipeline.put:
+        id: "my_pipeline"
+        body: >
+          {
+            "description": "_description",
+            "request_processors": [
+              {
+                "oversample" : {
+                  "sample_factor" : 2
+                }
+              }
+            ],
+            "response_processors": [
+              {
+                "collapse" : {
+                  "field" : "group_id"
+                }
+              },
+              {
+                "truncate_hits" : {}
+              }
+            ]
+          }
+  - match: { acknowledged: true }
+
+  - do:
+      index:
+        index: test
+        id: 1
+        body: {
+          "group_id": "a",
+          "popularity" : 1
+        }
+  - do:
+      index:
+        index: test
+        id: 2
+        body: {
+          "group_id": "a",
+          "popularity" : 2
+        }
+  - do:
+      index:
+        index: test
+        id: 3
+        body: {
+          "group_id": "b",
+          "popularity" : 3
+        }
+  - do:
+      index:
+        index: test
+        id: 4
+        body: {
+          "group_id": "b",
+          "popularity" : 4
+        }
+  - do:
+      indices.refresh:
+        index: test
+
+  - do:
+      search:
+        body: {
+          "query" : {
+            "function_score" : {
+              "field_value_factor" : {
+                "field" : "popularity"
+              }
+            }
+          },
+          "size" : 2
+        }
+  - match: { hits.total.value: 4 }
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "4" }
+  - match: { hits.hits.1._id: "3" }
+
+  - do:
+      search:
+        search_pipeline: my_pipeline
+        body: {
+          "query" : {
+            "function_score" : {
+              "field_value_factor" : {
+                "field" : "popularity"
+              }
+            }
+          },
+          "size" : 2
+        }
+  - match: { hits.total.value: 4 }
+  - length: { hits.hits: 2 }
+  - match: { hits.hits.0._id: "4" }
+  - match: { hits.hits.1._id: "2" }
diff --git a/modules/search-pipeline-common/src/yamlRestTest/resources/rest-api-spec/test/search_pipeline/70_script_truncate.yml b/modules/search-pipeline-common/src/yamlRestTest/resources/rest-api-spec/test/search_pipeline/70_script_truncate.yml
new file mode 100644
index 0000000000000..9c9f6747e9bdc
--- /dev/null
+++ b/modules/search-pipeline-common/src/yamlRestTest/resources/rest-api-spec/test/search_pipeline/70_script_truncate.yml
@@ -0,0 +1,70 @@
+---
+teardown:
+  - do:
+      search_pipeline.delete:
+        id: "my_pipeline"
+        ignore: 404
+
+---
+"Test state propagating from script request to truncate_hits processor":
+  - do:
+      search_pipeline.put:
+        id: "my_pipeline"
+        body: >
+          {
+            "description": "_description",
+            "request_processors": [
+              {
+                "script" : {
+                  "source" : "ctx.request_context['foo.original_size'] = 2"
+                }
+              }
+            ],
+            "response_processors": [
+              {
+                "truncate_hits" : {
+                  "context_prefix" : "foo"
+                }
+              }
+            ]
+          }
+  - match: { acknowledged: true }
+
+  - do:
+      index:
+        index: test
+        id: 1
+        body: {}
+  - do:
+      index:
+        index: test
+        id: 2
+        body: {}
+  - do:
+      index:
+        index: test
+        id: 3
+        body: {}
+  - do:
+      index:
+        index: test
+        id: 4
+        body: {}
+  - do:
+      indices.refresh:
+        index: test
+
+  - do:
+      search:
+        body: {
+        }
+  - match: { hits.total.value: 4 }
+  - length: { hits.hits: 4 }
+
+  - do:
+      search:
+        search_pipeline: my_pipeline
+        body: {
+        }
+  - match: { hits.total.value: 4 }
+  - length: { hits.hits: 2 }
diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle
index 16f2d2c5f23c6..c3d70e9c64968 100644
--- a/plugins/discovery-azure-classic/build.gradle
+++ b/plugins/discovery-azure-classic/build.gradle
@@ -53,7 +53,7 @@ dependencies {
   api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
   api "commons-codec:commons-codec:${versions.commonscodec}"
   api "commons-lang:commons-lang:2.6"
-  api "commons-io:commons-io:2.15.0"
+  api "commons-io:commons-io:2.15.1"
   api 'javax.mail:mail:1.4.7'
   api 'javax.inject:javax.inject:1'
   api "com.sun.jersey:jersey-client:${versions.jersey}"
diff --git a/plugins/discovery-azure-classic/licenses/commons-io-2.15.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/commons-io-2.15.0.jar.sha1
deleted file mode 100644
index 73709383fd130..0000000000000
--- a/plugins/discovery-azure-classic/licenses/commons-io-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c3c2db10f6f797430a7f9c696b4d1273768c924
\ No newline at end of file
diff --git a/plugins/discovery-azure-classic/licenses/commons-io-2.15.1.jar.sha1 b/plugins/discovery-azure-classic/licenses/commons-io-2.15.1.jar.sha1
new file mode 100644
index 0000000000000..47c5d13812a36
--- /dev/null
+++ b/plugins/discovery-azure-classic/licenses/commons-io-2.15.1.jar.sha1
@@ -0,0 +1 @@
+f11560da189ab563a5c8e351941415430e9304ea
\ No newline at end of file
diff --git a/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java b/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java
index 51f0ad9526e55..a2e920761b655 100644
--- a/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java
+++ b/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java
@@ -99,7 +99,7 @@ protected Ec2Client buildClient(
 
         if (Strings.hasText(endpoint)) {
             logger.debug("using explicit ec2 endpoint [{}]", endpoint);
-            builder.endpointOverride(URI.create(endpoint));
+            builder.endpointOverride(URI.create(getFullEndpoint(endpoint)));
         }
 
         if (Strings.hasText(region)) {
@@ -110,6 +110,19 @@ protected Ec2Client buildClient(
         return SocketAccess.doPrivileged(builder::build);
     }
 
+    protected String getFullEndpoint(String endpoint) {
+        if (!Strings.hasText(endpoint)) {
+            return null;
+        }
+        if (endpoint.startsWith("http://") || endpoint.startsWith("https://")) {
+            return endpoint;
+        }
+
+        // if no scheme is provided, default to https
+        logger.debug("no scheme found in endpoint [{}], defaulting to https", endpoint);
+        return "https://" + endpoint;
+    }
+
     static ProxyConfiguration buildProxyConfiguration(Logger logger, Ec2ClientSettings clientSettings) {
         if (Strings.hasText(clientSettings.proxyHost)) {
             try {
diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java
index 81310f7e2e3c3..3164abe456515 100644
--- a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java
+++ b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AwsEc2ServiceImplTests.java
@@ -202,4 +202,32 @@ public void testAWSConfigurationWithAwsSettings() {
         assertTrue(clientOverrideConfiguration.retryPolicy().isPresent());
         assertThat(clientOverrideConfiguration.retryPolicy().get().numRetries(), is(10));
     }
+
+    public void testGetFullEndpointWithScheme() {
+        final Settings settings = Settings.builder().put("discovery.ec2.endpoint", "http://ec2.us-west-2.amazonaws.com").build();
+        Ec2ClientSettings clientSettings = Ec2ClientSettings.getClientSettings(settings);
+
+        AwsEc2ServiceImpl awsEc2ServiceImpl = new AwsEc2ServiceImpl();
+
+        String endpoint = awsEc2ServiceImpl.getFullEndpoint(clientSettings.endpoint);
+        assertEquals("http://ec2.us-west-2.amazonaws.com", endpoint);
+
+        assertEquals("http://httpserver.example.com", awsEc2ServiceImpl.getFullEndpoint("http://httpserver.example.com"));
+
+        assertEquals("https://httpserver.example.com", awsEc2ServiceImpl.getFullEndpoint("https://httpserver.example.com"));
+    }
+
+    public void testGetFullEndpointWithoutScheme() {
+        final Settings settings = Settings.builder().put("discovery.ec2.endpoint", "ec2.us-west-2.amazonaws.com").build();
+        Ec2ClientSettings clientSettings = Ec2ClientSettings.getClientSettings(settings);
+
+        AwsEc2ServiceImpl awsEc2ServiceImpl = new AwsEc2ServiceImpl();
+
+        String endpoint = awsEc2ServiceImpl.getFullEndpoint(clientSettings.endpoint);
+        assertEquals("https://ec2.us-west-2.amazonaws.com", endpoint);
+
+        assertEquals("https://httpserver.example.com", awsEc2ServiceImpl.getFullEndpoint("httpserver.example.com"));
+
+        assertNull(awsEc2ServiceImpl.getFullEndpoint(""));
+    }
 }
diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle
index 0cfdd8f24325a..22db73ad86796 100644
--- a/plugins/ingest-attachment/build.gradle
+++ b/plugins/ingest-attachment/build.gradle
@@ -57,7 +57,7 @@ dependencies {
   runtimeOnly "com.google.guava:guava:${versions.guava}"
   // Other dependencies
   api 'org.tukaani:xz:1.9'
-  api 'commons-io:commons-io:2.15.0'
+  api 'commons-io:commons-io:2.15.1'
   api "org.slf4j:slf4j-api:${versions.slf4j}"
 
   // character set detection
@@ -79,7 +79,7 @@ dependencies {
   api "org.apache.poi:poi:${versions.poi}"
   api "org.apache.poi:poi-ooxml-lite:${versions.poi}"
   api "commons-codec:commons-codec:${versions.commonscodec}"
-  api 'org.apache.xmlbeans:xmlbeans:5.1.1'
+  api 'org.apache.xmlbeans:xmlbeans:5.2.0'
   api 'org.apache.commons:commons-collections4:4.4'
   // MS Office
   api "org.apache.poi:poi-scratchpad:${versions.poi}"
diff --git a/plugins/ingest-attachment/licenses/commons-io-2.15.0.jar.sha1 b/plugins/ingest-attachment/licenses/commons-io-2.15.0.jar.sha1
deleted file mode 100644
index 73709383fd130..0000000000000
--- a/plugins/ingest-attachment/licenses/commons-io-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c3c2db10f6f797430a7f9c696b4d1273768c924
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/commons-io-2.15.1.jar.sha1 b/plugins/ingest-attachment/licenses/commons-io-2.15.1.jar.sha1
new file mode 100644
index 0000000000000..47c5d13812a36
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/commons-io-2.15.1.jar.sha1
@@ -0,0 +1 @@
+f11560da189ab563a5c8e351941415430e9304ea
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/xmlbeans-5.1.1.jar.sha1 b/plugins/ingest-attachment/licenses/xmlbeans-5.1.1.jar.sha1
deleted file mode 100644
index 4d1d2ad0807e7..0000000000000
--- a/plugins/ingest-attachment/licenses/xmlbeans-5.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-48a369df0eccb509d46203104e4df9cb00f0f68b
\ No newline at end of file
diff --git a/plugins/ingest-attachment/licenses/xmlbeans-5.2.0.jar.sha1 b/plugins/ingest-attachment/licenses/xmlbeans-5.2.0.jar.sha1
new file mode 100644
index 0000000000000..f34274d593697
--- /dev/null
+++ b/plugins/ingest-attachment/licenses/xmlbeans-5.2.0.jar.sha1
@@ -0,0 +1 @@
+6198ac997b3f234f2b5393fa415f78fac2e06510
\ No newline at end of file
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
index ed1f54888a26f..f04d42a2155d6 100644
--- a/plugins/repository-hdfs/build.gradle
+++ b/plugins/repository-hdfs/build.gradle
@@ -70,13 +70,13 @@ dependencies {
   api 'com.google.code.gson:gson:2.10.1'
   runtimeOnly "com.google.guava:guava:${versions.guava}"
   api "commons-logging:commons-logging:${versions.commonslogging}"
-  api 'commons-cli:commons-cli:1.5.0'
+  api 'commons-cli:commons-cli:1.6.0'
   api "commons-codec:commons-codec:${versions.commonscodec}"
   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 'org.apache.commons:commons-lang3:3.13.0'
+  api 'org.apache.commons:commons-lang3:3.14.0'
   implementation 'com.google.re2j:re2j:1.7'
   api 'javax.servlet:servlet-api:2.5'
   api "org.slf4j:slf4j-api:${versions.slf4j}"
diff --git a/plugins/repository-hdfs/licenses/commons-cli-1.5.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-cli-1.5.0.jar.sha1
deleted file mode 100644
index 8f9e064eda2d0..0000000000000
--- a/plugins/repository-hdfs/licenses/commons-cli-1.5.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dc98be5d5390230684a092589d70ea76a147925c
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/commons-cli-1.6.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-cli-1.6.0.jar.sha1
new file mode 100644
index 0000000000000..bb94eda6814ea
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/commons-cli-1.6.0.jar.sha1
@@ -0,0 +1 @@
+38166a23afb5bd5520f739b87b3be87f7f0fb96d
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/commons-lang3-3.13.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-lang3-3.13.0.jar.sha1
deleted file mode 100644
index d0c2f2486ee1f..0000000000000
--- a/plugins/repository-hdfs/licenses/commons-lang3-3.13.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7263237aa89c1f99b327197c41d0669707a462e
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/commons-lang3-3.14.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-lang3-3.14.0.jar.sha1
new file mode 100644
index 0000000000000..d783e07e40902
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/commons-lang3-3.14.0.jar.sha1
@@ -0,0 +1 @@
+1ed471194b02f2c6cb734a0cd6f6f107c673afae
\ No newline at end of file
diff --git a/release-notes/opensearch.release-notes-1.3.14.md b/release-notes/opensearch.release-notes-1.3.14.md
new file mode 100644
index 0000000000000..319f5a79781c7
--- /dev/null
+++ b/release-notes/opensearch.release-notes-1.3.14.md
@@ -0,0 +1,18 @@
+## 2023-12-12 Version 1.3.14 Release Notes
+
+### Upgrades
+- Bump asm from 9.5 to 9.6 ([#10302](https://github.com/opensearch-project/OpenSearch/pull/10302))
+- Bump netty from 4.1.97.Final to 4.1.99.Final ([#10303](https://github.com/opensearch-project/OpenSearch/pull/10303))
+- Bump `netty` from 4.1.99.Final to 4.1.100.Final ([#10564](https://github.com/opensearch-project/OpenSearch/pull/10564))
+- Bump `netty` from 4.1.100.Final to 4.1.101.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294))
+- Bump `org.apache.zookeeper:zookeper` from 3.8.0 to 3.8.3 ([#11476](https://github.com/opensearch-project/OpenSearch/pull/11476))
+- Bump `org.bouncycastle:bc-fips` from 1.0.2.3 to 1.0.2.4 ([#10297](https://github.com/opensearch-project/OpenSearch/pull/10297))
+- Bump `org.apache.avro:avro` from 1.10.2 to 1.11.3 ([#11502](https://github.com/opensearch-project/OpenSearch/pull/11502))
+- Bump `jetty` from 9.4.51.v20230217 to 9.4.52.v20230823 ([#11501](https://github.com/opensearch-project/OpenSearch/pull/11501))
+- Bump `io.projectreactor:reactor-core` from 3.4.23 to 3.4.34 and reactor-netty from 1.0.24 to 1.0.39 ([#11500](https://github.com/opensearch-project/OpenSearch/pull/11500))
+- Bump `logback-core` and `logback-classic` to 1.2.13 ([#11521](https://github.com/opensearch-project/OpenSearch/pull/11521))
+- Bumps `jetty` version from 9.4.52.v20230823 to 9.4.53.v20231009 ([#11539](https://github.com/opensearch-project/OpenSearch/pull/11539))
+
+### Bug Fixes
+- Use iterative approach to evaluate Regex.simpleMatch ([#11060](https://github.com/opensearch-project/OpenSearch/pull/11060))
+- Improve compressed request handling ([#10261](https://github.com/opensearch-project/OpenSearch/pull/10261))
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/40_max_shard_size.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/40_max_shard_size.yml
index 32ac11097d3dc..bac2898ccea1c 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/40_max_shard_size.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/40_max_shard_size.yml
@@ -4,8 +4,8 @@
   # number_of_shards for the target index.
 
   - skip:
-      version: " - 2.99.99"
-      reason: "only available in 3.0+"
+      version: " - 2.4.99"
+      reason: "max_shard_size was introduced in 2.5.0"
       features: allowed_warnings
 
   - do:
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
new file mode 100644
index 0000000000000..085c5633ac72b
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string_field_match_only_text.yml
@@ -0,0 +1,53 @@
+---
+"validate_query with query_string parameters":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+          index:  test
+          body:
+            mappings:
+              properties:
+                field:
+                  type: match_only_text
+                number:
+                  type: integer
+
+  - do:
+      indices.validate_query:
+        index: test
+        q: bar
+        df: field
+
+  - is_true: valid
+
+  - do:
+      indices.validate_query:
+        index: test
+        q: field:foo field:xyz
+
+  - is_true: valid
+
+  - do:
+      indices.validate_query:
+        index: test
+        q: field:foo field:xyz
+        default_operator: AND
+
+  - is_true: valid
+
+  - do:
+      indices.validate_query:
+        index: test
+        q: field:BA*
+
+  - is_true: valid
+
+  - do:
+      indices.validate_query:
+        index: test
+        q: number:foo
+        lenient: true
+
+  - is_true: valid
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
new file mode 100644
index 0000000000000..7a96536a2e261
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms_field_match_only_text.yml
@@ -0,0 +1,76 @@
+---
+"Default index":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+          index:  goodbad
+          body:
+            settings:
+                number_of_shards: "1"
+            mappings:
+                properties:
+                    text:
+                        type: match_only_text
+                        fielddata: true
+                    class:
+                        type: keyword
+
+  - do:
+      index:
+          index:  goodbad
+          id:     1
+          body:   { text: "good", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     2
+          body:   { text: "good", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     3
+          body:   { text: "bad", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     4
+          body:   { text: "bad", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     5
+          body:   { text: "good bad", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     6
+          body:   { text: "good bad", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     7
+          body:   { text: "bad", class: "bad" }
+
+
+
+  - do:
+      indices.refresh:
+        index: [goodbad]
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: goodbad
+
+  - match: {hits.total: 7}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: goodbad
+        body: {"aggs": {"class": {"terms": {"field": "class"},"aggs": {"sig_terms": {"significant_terms": {"field": "text"}}}}}}
+
+  - match: {aggregations.class.buckets.0.sig_terms.buckets.0.key: "bad"}
+  - match: {aggregations.class.buckets.1.sig_terms.buckets.0.key: "good"}
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
new file mode 100644
index 0000000000000..bc41f157dfdc4
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/90_sig_text_field_match_only_text.yml
@@ -0,0 +1,155 @@
+---
+"Default index":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+          index:  goodbad
+          body:
+            settings:
+                number_of_shards: "1"
+            mappings:
+                properties:
+                    text:
+                        type: match_only_text
+                        fielddata: false
+                    class:
+                        type: keyword
+
+  - do:
+      index:
+          index:  goodbad
+          id:     1
+          body:   { text: "good", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     2
+          body:   { text: "good", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     3
+          body:   { text: "bad", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     4
+          body:   { text: "bad", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     5
+          body:   { text: "good bad", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     6
+          body:   { text: "good bad", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     7
+          body:   { text: "bad", class: "bad" }
+
+
+
+  - do:
+      indices.refresh:
+        index: [goodbad]
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: goodbad
+
+  - match: {hits.total: 7}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: goodbad
+        body: {"aggs": {"class": {"terms": {"field": "class"},"aggs": {"sig_text": {"significant_text": {"field": "text"}}}}}}
+
+  - match: {aggregations.class.buckets.0.sig_text.buckets.0.key: "bad"}
+  - match: {aggregations.class.buckets.1.sig_text.buckets.0.key: "good"}
+
+---
+"Dedup noise":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+          index:  goodbad
+          body:
+            settings:
+                number_of_shards: "1"
+            mappings:
+                properties:
+                    text:
+                        type: match_only_text
+                        fielddata: false
+                    class:
+                        type: keyword
+
+  - do:
+      index:
+          index:  goodbad
+          id:     1
+          body:   { text: "good noisewords1 g1 g2 g3 g4 g5 g6", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     2
+          body:   { text: "good  noisewords2 g1 g2 g3 g4 g5 g6", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     3
+          body:   { text: "bad noisewords3 b1 b2 b3 b4 b5 b6", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     4
+          body:   { text: "bad noisewords4 b1 b2 b3 b4 b5 b6", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     5
+          body:   { text: "good bad noisewords5 gb1 gb2 gb3 gb4 gb5 gb6", class: "good" }
+  - do:
+      index:
+          index:  goodbad
+          id:     6
+          body:   { text: "good bad noisewords6 gb1 gb2 gb3 gb4 gb5 gb6", class: "bad" }
+  - do:
+      index:
+          index:  goodbad
+          id:     7
+          body:   { text: "bad noisewords7 b1 b2 b3 b4 b5 b6", class: "bad" }
+
+
+
+  - do:
+      indices.refresh:
+        index: [goodbad]
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: goodbad
+
+  - match: {hits.total: 7}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: goodbad
+        body: {"aggs": {"class": {"terms": {"field": "class"},"aggs": {"sig_text": {"significant_text": {"field": "text", "filter_duplicate_text": true}}}}}}
+
+  - match: {aggregations.class.buckets.0.sig_text.buckets.0.key: "bad"}
+  - length: { aggregations.class.buckets.0.sig_text.buckets: 1 }
+  - match: {aggregations.class.buckets.1.sig_text.buckets.0.key: "good"}
+  - length: { aggregations.class.buckets.1.sig_text.buckets: 1 }
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
new file mode 100644
index 0000000000000..7100d620bf19e
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/20_highlighting_field_match_only_text.yml
@@ -0,0 +1,137 @@
+setup:
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            _source:
+              excludes: ["nested.stored_only"]
+            properties:
+              nested:
+                type: nested
+                properties:
+                  field:
+                    type: text
+                    fields:
+                      vectors:
+                        type: text
+                        term_vector: "with_positions_offsets"
+                      postings:
+                        type: text
+                        index_options: "offsets"
+                  stored:
+                    type: match_only_text
+                    store: true
+                  stored_only:
+                    type: match_only_text
+                    store: true
+  - do:
+      index:
+        index: test
+        id:    1
+        refresh: true
+        body:
+          nested:
+            field : "The quick brown fox is brown."
+            stored : "The quick brown fox is brown."
+            stored_only : "The quick brown fox is brown."
+
+---
+"Unified highlighter":
+  - do:
+      search:
+        index: test
+        body:
+          query:
+            nested:
+              path: "nested"
+              query:
+                multi_match:
+                  query: "quick brown fox"
+                  fields: [ "nested.field", "nested.field.vectors", "nested.field.postings" ]
+              inner_hits:
+                highlight:
+                  type: "unified"
+                  fields:
+                    nested.field: {}
+                    nested.field.vectors: {}
+                    nested.field.postings: {}
+
+  - match: { hits.hits.0.inner_hits.nested.hits.hits.0.highlight.nested\.field.0: "The <em>quick</em> <em>brown</em> <em>fox</em> is <em>brown</em>." }
+  - match: { hits.hits.0.inner_hits.nested.hits.hits.0.highlight.nested\.field\.vectors.0: "The <em>quick</em> <em>brown</em> <em>fox</em> is <em>brown</em>." }
+  - match: { hits.hits.0.inner_hits.nested.hits.hits.0.highlight.nested\.field\.postings.0: "The <em>quick</em> <em>brown</em> <em>fox</em> is <em>brown</em>." }
+
+---
+"Unified highlighter with stored fields":
+  - do:
+      search:
+        index: test
+        body:
+          query:
+            nested:
+              path: "nested"
+              query:
+                multi_match:
+                  query: "quick brown fox"
+                  fields: [ "nested.stored", "nested.stored_only" ]
+              inner_hits:
+                highlight:
+                  type: "unified"
+                  fields:
+                    nested.stored: {}
+                    nested.stored_only: {}
+
+  - match: { hits.hits.0.inner_hits.nested.hits.hits.0.highlight.nested\.stored.0: "The <em>quick</em> <em>brown</em> <em>fox</em> is <em>brown</em>." }
+  - match: { hits.hits.0.inner_hits.nested.hits.hits.0.highlight.nested\.stored_only.0: "The <em>quick</em> <em>brown</em> <em>fox</em> is <em>brown</em>." }
+
+---
+"Unified highlighter with stored fields and disabled source":
+  - do:
+      indices.create:
+        index: disabled_source
+        body:
+          mappings:
+            _source:
+              enabled: false
+            properties:
+              nested:
+                type: nested
+                properties:
+                  field:
+                    type: match_only_text
+                  stored_only:
+                    type: match_only_text
+                    store: true
+  - do:
+      index:
+        index: disabled_source
+        id:    1
+        refresh: true
+        body:
+          nested:
+            field: "The quick brown fox is brown."
+            stored_only: "The quick brown fox is brown."
+
+  - do:
+      search:
+        index: disabled_source
+        body:
+          query:
+            nested:
+              path: "nested"
+              query:
+                multi_match:
+                  query: "quick brown fox"
+                  fields: ["nested.field", "nested.stored_only"]
+              inner_hits:
+                highlight:
+                  type: "unified"
+                  fields:
+                    nested.field: {}
+                    nested.stored_only: {}
+
+  - is_false: hits.hits.0.inner_hits.nested.hits.hits.0.highlight.nested\.field
+  - match: { hits.hits.0.inner_hits.nested.hits.hits.0.highlight.nested\.stored_only.0: "The <em>quick</em> <em>brown</em> <em>fox</em> is <em>brown</em>."}
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
new file mode 100644
index 0000000000000..03626236604a1
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/160_exists_query_match_only_text.yml
@@ -0,0 +1,119 @@
+setup:
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+      features: ["headers"]
+
+  - do:
+      indices.create:
+        index:  test
+        body:
+          mappings:
+            dynamic: false
+            properties:
+              match_only_text:
+                type: match_only_text
+
+  - do:
+      headers:
+        Content-Type: application/json
+      index:
+        index:  "test"
+        id:     1
+        body:
+          match_only_text: "foo bar"
+
+  - do:
+      headers:
+        Content-Type: application/json
+      index:
+        index:  "test"
+        id:     2
+        body:
+          match_only_text: "foo bar"
+
+  - do:
+      headers:
+        Content-Type: application/json
+      index:
+        index:  "test"
+        id:     3
+        routing: "route_me"
+        body:
+          match_only_text: "foo bar"
+
+  - do:
+      index:
+        index:  "test"
+        id:     4
+        body: {}
+
+  - do:
+      indices.create:
+        index:  test-unmapped
+        body:
+          mappings:
+            dynamic: false
+            properties:
+              unrelated:
+                type: keyword
+
+  - do:
+      index:
+        index:  "test-unmapped"
+        id:     1
+        body:
+          unrelated: "foo"
+
+  - do:
+      indices.create:
+        index:  test-empty
+        body:
+          mappings:
+            dynamic: false
+            properties:
+              match_only_text:
+                type: match_only_text
+
+  - do:
+      indices.refresh:
+        index: [test, test-unmapped, test-empty]
+
+---
+"Test exists query on mapped match_only_text field":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            exists:
+              field: match_only_text
+
+  - match: {hits.total: 3}
+
+---
+"Test exists query on unmapped match_only_text field":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-unmapped
+        body:
+          query:
+            exists:
+              field: match_only_text
+
+  - match: {hits.total: 0}
+
+---
+"Test exists query on match_only_text field in empty index":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-empty
+        body:
+          query:
+            exists:
+              field: match_only_text
+
+  - match: {hits.total: 0}
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
new file mode 100644
index 0000000000000..a41b8d353e3e9
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/200_phrase_search_field_match_only_text.yml
@@ -0,0 +1,67 @@
+---
+"search with indexed phrases":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+
+  - do:
+      indices.create:
+        index:  test
+        body:
+          mappings:
+            properties:
+              text:
+                type: match_only_text
+
+  - do:
+      index:
+          index:  test
+          id:     1
+          body:   { text: "peter piper picked a peck of pickled peppers" }
+
+  - do:
+      indices.refresh:
+        index: [test]
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_phrase:
+              text:
+                query: "peter piper"
+
+  - match: {hits.total: 1}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        q: '"peter piper"~1'
+        df: text
+
+  - match: {hits.total: 1}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_phrase:
+              text: "peter piper picked"
+
+  - match: {hits.total: 1}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_phrase:
+              text: "piper"
+
+  - match: {hits.total: 1}
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
new file mode 100644
index 0000000000000..fc4e9f9de0f38
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/310_match_bool_prefix_field_match_only_text.yml
@@ -0,0 +1,282 @@
+setup:
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+
+  - do:
+      indices.create:
+        index:  test
+        body:
+          mappings:
+            properties:
+              my_field1:
+                type: match_only_text
+              my_field2:
+                type: match_only_text
+
+  - do:
+      index:
+        index: test
+        id: 1
+        body:
+          my_field1: "brown fox jump"
+          my_field2: "xylophone"
+
+  - do:
+      index:
+        index: test
+        id: 2
+        body:
+          my_field1: "brown emu jump"
+          my_field2: "xylophone"
+
+  - do:
+      index:
+        index: test
+        id: 3
+        body:
+          my_field1: "jumparound"
+          my_field2: "emu"
+
+  - do:
+      index:
+        index: test
+        id: 4
+        body:
+          my_field1: "dog"
+          my_field2: "brown fox jump lazy"
+
+  - do:
+      indices.refresh: {}
+
+---
+"minimum should match":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_bool_prefix:
+              my_field1:
+                query: "brown fox jump"
+                minimum_should_match: 3
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.0._source.my_field1: "brown fox jump" }
+
+---
+"analyzer":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_bool_prefix:
+              my_field1:
+                query: "BROWN dog"
+                analyzer: whitespace                # this analyzer doesn't lowercase terms
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "4" }
+  - match: { hits.hits.0._source.my_field1: "dog" }
+
+---
+"operator":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_bool_prefix:
+              my_field1:
+                query: "brown fox jump"
+                operator: AND
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "1" }
+  - match: { hits.hits.0._source.my_field1: "brown fox jump" }
+
+---
+"fuzziness":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            match_bool_prefix:
+              my_field2:
+                query: "xylophoen foo"
+                fuzziness: 1
+                prefix_length: 1
+                max_expansions: 10
+                fuzzy_transpositions: true
+                fuzzy_rewrite: constant_score
+
+  - match: { hits.total: 2 }
+  - match: { hits.hits.0._source.my_field2: "xylophone" }
+  - match: { hits.hits.1._source.my_field2: "xylophone" }
+
+---
+"multi_match single field complete term":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fox jump"
+              type: bool_prefix
+              fields: [ "my_field1" ]
+
+  - match: { hits.total: 3 }
+
+---
+"multi_match single field partial term":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fox ju"
+              type: bool_prefix
+              fields: [ "my_field1" ]
+
+  - match: { hits.total: 3 }
+
+---
+"multi_match multiple fields complete term":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fox jump lazy"
+              type: bool_prefix
+              fields: [ "my_field1", "my_field2" ]
+
+  - match: { hits.total: 3 }
+
+---
+"multi_match multiple fields partial term":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fox jump laz"
+              type: bool_prefix
+              fields: [ "my_field1", "my_field2" ]
+
+  - match: { hits.total: 3 }
+
+---
+"multi_match multiple fields with analyzer":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "BROWN FOX JUMP dog"
+              type: bool_prefix
+              fields: [ "my_field1", "my_field2" ]
+              analyzer: whitespace                   # this analyzer doesn't lowercase terms
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "4" }
+  - match: { hits.hits.0._source.my_field1: "dog" }
+  - match: { hits.hits.0._source.my_field2: "brown fox jump lazy" }
+
+---
+"multi_match multiple fields with minimum_should_match":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown fox jump la"
+              type: bool_prefix
+              fields: [ "my_field1", "my_field2" ]
+              minimum_should_match: 4
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "4" }
+  - match: { hits.hits.0._source.my_field1: "dog" }
+  - match: { hits.hits.0._source.my_field2: "brown fox jump lazy" }
+
+---
+"multi_match multiple fields with fuzziness":
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "dob nomatch"
+              type: bool_prefix
+              fields: [ "my_field1", "my_field2" ]
+              fuzziness: 1
+
+  - match: { hits.total: 1 }
+  - match: { hits.hits.0._id: "4" }
+  - match: { hits.hits.0._source.my_field1: "dog" }
+  - match: { hits.hits.0._source.my_field2: "brown fox jump lazy" }
+
+---
+"multi_match multiple fields with slop throws exception":
+
+  - do:
+      catch: /\[slop\] not allowed for type \[bool_prefix\]/
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown"
+              type: bool_prefix
+              fields: [ "my_field1", "my_field2" ]
+              slop: 1
+
+---
+"multi_match multiple fields with cutoff_frequency throws exception":
+
+  - do:
+      catch: /\[cutoff_frequency\] not allowed for type \[bool_prefix\]/
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          query:
+            multi_match:
+              query: "brown"
+              type: bool_prefix
+              fields: [ "my_field1", "my_field2" ]
+              cutoff_frequency: 0.001
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
new file mode 100644
index 0000000000000..f4faf87eb83cc
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/320_disallow_queries_field_match_only_text.yml
@@ -0,0 +1,141 @@
+---
+setup:
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            properties:
+              text:
+                type: match_only_text
+                analyzer: standard
+                fields:
+                  raw:
+                    type: keyword
+              nested1:
+                type: nested
+
+  - do:
+      bulk:
+        refresh: true
+        body:
+          - '{"index": {"_index": "test", "_id": "1"}}'
+          - '{"text" : "Some like it hot, some like it cold", "nested1": [{"foo": "bar1"}]}'
+          - '{"index": {"_index": "test", "_id": "2"}}'
+          - '{"text" : "Its cold outside, theres no kind of atmosphere", "nested1": [{"foo": "bar2"}]}'
+          - '{"index": {"_index": "test", "_id": "3"}}'
+          - '{"text" : "Baby its cold there outside", "nested1": [{"foo": "bar3"}]}'
+          - '{"index": {"_index": "test", "_id": "4"}}'
+          - '{"text" : "Outside it is cold and wet", "nested1": [{"foo": "bar4"}]}'
+
+---
+teardown:
+
+  - do:
+      cluster.put_settings:
+        body:
+          transient:
+            search.allow_expensive_queries: null
+
+---
+"Test disallow expensive queries":
+
+  ### Check for initial setting = null -> false
+  - do:
+      cluster.get_settings:
+        flat_settings: true
+
+  - is_false: search.allow_expensive_queries
+
+  ### Update setting to false
+  - do:
+      cluster.put_settings:
+        body:
+          transient:
+            search.allow_expensive_queries: "false"
+        flat_settings: true
+
+  - match: {transient: {search.allow_expensive_queries: "false"}}
+
+  ### Prefix
+  - do:
+      catch: /\[prefix\] queries cannot be executed when \'search.allow_expensive_queries\' is set to false. For optimised prefix queries on text fields please enable \[index_prefixes\]./
+      search:
+        index: test
+        body:
+          query:
+            prefix:
+              text:
+                value: out
+
+  ### Fuzzy
+  - do:
+      catch: /\[fuzzy\] queries cannot be executed when \'search.allow_expensive_queries\' is set to false./
+      search:
+        index: test
+        body:
+          query:
+            fuzzy:
+              text:
+                value: outwide
+
+  ### Regexp
+  - do:
+      catch: /\[regexp\] queries cannot be executed when \'search.allow_expensive_queries\' is set to false./
+      search:
+        index: test
+        body:
+          query:
+            regexp:
+              text:
+                value: .*ou.*id.*
+
+  ### Wildcard
+  - do:
+      catch: /\[wildcard\] queries cannot be executed when \'search.allow_expensive_queries\' is set to false./
+      search:
+        index: test
+        body:
+          query:
+            wildcard:
+              text:
+                value: out?ide
+
+  ### Range on text
+  - do:
+      catch: /\[range\] queries on \[text\] or \[keyword\] fields cannot be executed when \'search.allow_expensive_queries\' is set to false./
+      search:
+        index: test
+        body:
+          query:
+            range:
+              text:
+                gte: "theres"
+
+  ### Range on keyword
+  - do:
+      catch: /\[range\] queries on \[text\] or \[keyword\] fields cannot be executed when \'search.allow_expensive_queries\' is set to false./
+      search:
+        index: test
+        body:
+          query:
+            range:
+              text.raw:
+                gte : "Outside it is cold and wet"
+
+  ### Nested
+  - do:
+      catch: /\[joining\] queries cannot be executed when \'search.allow_expensive_queries\' is set to false./
+      search:
+        index: test
+        body:
+          query:
+            nested:
+              path: "nested1"
+              query:
+                bool:
+                  must: [{"match" : {"nested1.foo" : "bar2"}}]
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
new file mode 100644
index 0000000000000..cc15796e4697f
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic_field_match_only_field.yml
@@ -0,0 +1,92 @@
+---
+"Search shards aliases with and without filters":
+  - skip:
+      version: " - 2.99.99"
+      reason: "match_only_text was added in 3.0"
+
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            index:
+              number_of_shards: 1
+              number_of_replicas: 0
+          mappings:
+            properties:
+              field:
+                type: match_only_text
+          aliases:
+            test_alias_no_filter: {}
+            test_alias_filter_1:
+              filter:
+                term:
+                  field : value1
+            test_alias_filter_2:
+              filter:
+                term:
+                  field : value2
+
+  - do:
+      search_shards:
+        index:  test_alias_no_filter
+
+  - length: { shards: 1 }
+  - match: { shards.0.0.index: test_index }
+  - is_true: indices.test_index
+  - is_false: indices.test_index.filter
+  - match: { indices.test_index.aliases: [test_alias_no_filter]}
+
+  - do:
+      search_shards:
+        index:  test_alias_filter_1
+
+  - length: { shards: 1 }
+  - match: { shards.0.0.index: test_index }
+  - match: { indices.test_index.aliases: [test_alias_filter_1] }
+  - match: { indices.test_index.filter.term.field.value: value1 }
+  - lte: { indices.test_index.filter.term.field.boost: 1.0 }
+  - gte: { indices.test_index.filter.term.field.boost: 1.0 }
+
+  - do:
+      search_shards:
+        index:  ["test_alias_filter_1","test_alias_filter_2"]
+
+  - length: { shards: 1 }
+  - match: { shards.0.0.index: test_index }
+  - match: { indices.test_index.aliases: [test_alias_filter_1, test_alias_filter_2]}
+  - length: { indices.test_index.filter.bool.should: 2 }
+  - lte: { indices.test_index.filter.bool.should.0.term.field.boost: 1.0 }
+  - gte: { indices.test_index.filter.bool.should.0.term.field.boost: 1.0 }
+  - lte: { indices.test_index.filter.bool.should.1.term.field.boost: 1.0 }
+  - gte: { indices.test_index.filter.bool.should.1.term.field.boost: 1.0 }
+  - match: { indices.test_index.filter.bool.adjust_pure_negative: true}
+  - lte: { indices.test_index.filter.bool.boost: 1.0 }
+  - gte: { indices.test_index.filter.bool.boost: 1.0 }
+
+  - do:
+      search_shards:
+        index:  "test*"
+
+  - length: { shards: 1 }
+  - match: { shards.0.0.index: test_index }
+  - match: { indices.test_index.aliases: [test_alias_filter_1, test_alias_filter_2, test_alias_no_filter]}
+  - is_false: indices.test_index.filter
+
+  - do:
+      search_shards:
+        index:  ["test_alias_filter_1","test_alias_no_filter"]
+
+  - length: { shards: 1 }
+  - match: { shards.0.0.index: test_index }
+  - match: { indices.test_index.aliases: [test_alias_filter_1, test_alias_no_filter]}
+  - is_false: indices.test_index.filter
+
+  - do:
+      search_shards:
+        index:  ["test_alias_no_filter"]
+
+  - length: { shards: 1 }
+  - match: { shards.0.0.index: test_index }
+  - match: { indices.test_index.aliases: [test_alias_no_filter]}
+  - is_false: indices.test_index.filter
diff --git a/server/build.gradle b/server/build.gradle
index 30e6c732c3e2d..e36498bf1038b 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -57,45 +57,6 @@ sourceSets {
     }
   }
 }
-// we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 11 so we do not include this source set in our IDEs
-if (!isEclipse) {
-  sourceSets {
-    java11 {
-      java {
-        srcDirs = ['src/main/java11']
-      }
-    }
-  }
-
-  configurations {
-    java11Implementation.extendsFrom(api)
-  }
-
-  dependencies {
-    java11Implementation sourceSets.main.output
-  }
-
-  compileJava11Java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-  }
-
-  tasks.named('forbiddenApisJava11').configure {
-    doFirst {
-      if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {
-        targetCompatibility = JavaVersion.VERSION_11
-      }
-    }
-  }
-
-  jar {
-    metaInf {
-      into 'versions/11'
-      from sourceSets.java11.output
-    }
-    manifest.attributes('Multi-Release': 'true')
-  }
-}
 
 dependencies {
 
@@ -147,6 +108,7 @@ dependencies {
   api "org.apache.logging.log4j:log4j-jul:${versions.log4j}"
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}", optional
   annotationProcessor "org.apache.logging.log4j:log4j-core:${versions.log4j}"
+  annotationProcessor project(':libs:opensearch-common')
 
   // jna
   api "net.java.dev.jna:jna:${versions.jna}"
@@ -178,7 +140,8 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 compileJava {
-  options.compilerArgs += ['-processor', 'org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor']
+  options.compilerArgs += ['-processor', ['org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor',
+    'org.opensearch.common.annotation.processor.ApiAnnotationProcessor'].join(','), '-AcontinueOnFailingChecks']
 }
 
 tasks.named("internalClusterTest").configure {
diff --git a/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java b/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java
index a7354dddfd16d..6275571cc2371 100644
--- a/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java
@@ -47,6 +47,7 @@
 import org.opensearch.cluster.block.ClusterBlockLevel;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.IndexMetadata.APIBlock;
+import org.opensearch.cluster.metadata.ProcessClusterEventTimeoutException;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.IndexNotFoundException;
@@ -491,10 +492,20 @@ public void testAddBlockWhileDeletingIndices() throws Exception {
                     } catch (InterruptedException e) {
                         throw new AssertionError(e);
                     }
-                    try {
-                        assertAcked(client().admin().indices().prepareDelete(indexToDelete));
-                    } catch (final Exception e) {
-                        exceptionConsumer.accept(e);
+                    int pendingRetries = 3;
+                    boolean success = false;
+                    while (success == false && pendingRetries-- > 0) {
+                        try {
+                            assertAcked(client().admin().indices().prepareDelete(indexToDelete));
+                            success = true;
+                        } catch (final Exception e) {
+                            Throwable cause = ExceptionsHelper.unwrapCause(e);
+                            if (cause instanceof ProcessClusterEventTimeoutException && pendingRetries > 0) {
+                                // ignore error & retry
+                                continue;
+                            }
+                            exceptionConsumer.accept(e);
+                        }
                     }
                 }));
             }
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 a82fd8d845709..c4e8ccfc0ecec 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationClusterSettingIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationClusterSettingIT.java
@@ -10,7 +10,10 @@
 
 import org.opensearch.action.admin.indices.settings.get.GetSettingsRequest;
 import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse;
+import org.opensearch.action.admin.indices.shrink.ResizeType;
+import org.opensearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
 import org.opensearch.cluster.metadata.IndexMetadata;
+import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.index.Index;
 import org.opensearch.index.IndexModule;
@@ -18,8 +21,15 @@
 import org.opensearch.indices.replication.common.ReplicationType;
 import org.opensearch.test.OpenSearchIntegTestCase;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REPLICATION_TYPE;
+import static org.opensearch.indices.IndicesService.CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING;
 import static org.opensearch.indices.IndicesService.CLUSTER_SETTING_REPLICATION_TYPE;
+import static org.hamcrest.Matchers.hasSize;
 
 @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0)
 public class SegmentReplicationClusterSettingIT extends OpenSearchIntegTestCase {
@@ -29,6 +39,9 @@ public class SegmentReplicationClusterSettingIT extends OpenSearchIntegTestCase
     protected static final int SHARD_COUNT = 1;
     protected static final int REPLICA_COUNT = 1;
 
+    protected static final String REPLICATION_MISMATCH_VALIDATION_ERROR =
+        "Validation Failed: 1: index setting [index.replication.type] is not allowed to be set as [cluster.index.restrict.replication.type=true];";
+
     @Override
     public Settings indexSettings() {
         return Settings.builder()
@@ -44,14 +57,6 @@ protected boolean addMockInternalEngine() {
         return false;
     }
 
-    @Override
-    protected Settings nodeSettings(int nodeOrdinal) {
-        return Settings.builder()
-            .put(super.nodeSettings(nodeOrdinal))
-            .put(CLUSTER_SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT)
-            .build();
-    }
-
     public void testIndexReplicationSettingOverridesSegRepClusterSetting() throws Exception {
         Settings settings = Settings.builder().put(CLUSTER_SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT).build();
         final String ANOTHER_INDEX = "test-index";
@@ -123,4 +128,125 @@ public void testIndexReplicationSettingOverridesDocRepClusterSetting() throws Ex
         assertEquals(indicesService.indexService(anotherIndex).getIndexSettings().isSegRepEnabled(), false);
     }
 
+    public void testReplicationTypesOverrideNotAllowed_IndexAPI() {
+        // Generate mutually exclusive replication strategies at cluster and index level
+        List<ReplicationType> replicationStrategies = getRandomReplicationTypesAsList();
+        ReplicationType clusterLevelReplication = replicationStrategies.get(0);
+        ReplicationType indexLevelReplication = replicationStrategies.get(1);
+        Settings nodeSettings = Settings.builder()
+            .put(CLUSTER_SETTING_REPLICATION_TYPE, clusterLevelReplication)
+            .put(CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING.getKey(), true)
+            .build();
+        internalCluster().startClusterManagerOnlyNode(nodeSettings);
+        internalCluster().startDataOnlyNode(nodeSettings);
+        Settings indexSettings = Settings.builder().put(indexSettings()).put(SETTING_REPLICATION_TYPE, indexLevelReplication).build();
+        IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> createIndex(INDEX_NAME, indexSettings));
+        assertEquals(REPLICATION_MISMATCH_VALIDATION_ERROR, exception.getMessage());
+    }
+
+    public void testReplicationTypesOverrideNotAllowed_WithTemplates() {
+        // Generate mutually exclusive replication strategies at cluster and index level
+        List<ReplicationType> replicationStrategies = getRandomReplicationTypesAsList();
+        ReplicationType clusterLevelReplication = replicationStrategies.get(0);
+        ReplicationType templateReplicationType = replicationStrategies.get(1);
+        Settings nodeSettings = Settings.builder()
+            .put(CLUSTER_SETTING_REPLICATION_TYPE, clusterLevelReplication)
+            .put(CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING.getKey(), true)
+            .build();
+        internalCluster().startClusterManagerOnlyNode(nodeSettings);
+        internalCluster().startDataOnlyNode(nodeSettings);
+        internalCluster().startDataOnlyNode(nodeSettings);
+        logger.info(
+            "--> Create index with template replication {} and cluster level replication {}",
+            templateReplicationType,
+            clusterLevelReplication
+        );
+        // Create index template
+        client().admin()
+            .indices()
+            .preparePutTemplate("template_1")
+            .setPatterns(Collections.singletonList("test-idx*"))
+            .setSettings(Settings.builder().put(indexSettings()).put(SETTING_REPLICATION_TYPE, templateReplicationType).build())
+            .setOrder(0)
+            .get();
+
+        GetIndexTemplatesResponse response = client().admin().indices().prepareGetTemplates().get();
+        assertThat(response.getIndexTemplates(), hasSize(1));
+        IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> createIndex(INDEX_NAME));
+        assertEquals(REPLICATION_MISMATCH_VALIDATION_ERROR, exception.getMessage());
+    }
+
+    public void testReplicationTypesOverrideNotAllowed_WithResizeAction() {
+        // Generate mutually exclusive replication strategies at cluster and index level
+        List<ReplicationType> replicationStrategies = getRandomReplicationTypesAsList();
+        ReplicationType clusterLevelReplication = replicationStrategies.get(0);
+        ReplicationType indexLevelReplication = replicationStrategies.get(1);
+        Settings nodeSettings = Settings.builder()
+            .put(CLUSTER_SETTING_REPLICATION_TYPE, clusterLevelReplication)
+            .put(CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING.getKey(), true)
+            .build();
+        internalCluster().startClusterManagerOnlyNode(nodeSettings);
+        internalCluster().startDataOnlyNode(nodeSettings);
+        internalCluster().startDataOnlyNode(nodeSettings);
+        logger.info(
+            "--> Create index with index level replication {} and cluster level replication {}",
+            indexLevelReplication,
+            clusterLevelReplication
+        );
+
+        // Define resize action and target shard count.
+        List<Tuple<ResizeType, Integer>> resizeActionsList = new ArrayList<>();
+        final int initialShardCount = 2;
+        resizeActionsList.add(new Tuple<>(ResizeType.SPLIT, 2 * initialShardCount));
+        resizeActionsList.add(new Tuple<>(ResizeType.SHRINK, SHARD_COUNT));
+        resizeActionsList.add(new Tuple<>(ResizeType.CLONE, initialShardCount));
+
+        Tuple<ResizeType, Integer> resizeActionTuple = resizeActionsList.get(random().nextInt(resizeActionsList.size()));
+        final String targetIndexName = resizeActionTuple.v1().name().toLowerCase(Locale.ROOT) + "-target";
+
+        logger.info("--> Performing resize action {} with shard count {}", resizeActionTuple.v1(), resizeActionTuple.v2());
+
+        Settings indexSettings = Settings.builder()
+            .put(indexSettings())
+            .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, initialShardCount)
+            .put(SETTING_REPLICATION_TYPE, clusterLevelReplication)
+            .build();
+        createIndex(INDEX_NAME, indexSettings);
+
+        // Block writes
+        client().admin().indices().prepareUpdateSettings(INDEX_NAME).setSettings(Settings.builder().put("index.blocks.write", true)).get();
+        ensureGreen();
+
+        // Validate resize action fails
+        IllegalArgumentException exception = expectThrows(
+            IllegalArgumentException.class,
+            () -> client().admin()
+                .indices()
+                .prepareResizeIndex(INDEX_NAME, targetIndexName)
+                .setResizeType(resizeActionTuple.v1())
+                .setSettings(
+                    Settings.builder()
+                        .put("index.number_of_replicas", 0)
+                        .put("index.number_of_shards", resizeActionTuple.v2())
+                        .putNull("index.blocks.write")
+                        .put(SETTING_REPLICATION_TYPE, indexLevelReplication)
+                        .build()
+                )
+                .get()
+        );
+        assertEquals(REPLICATION_MISMATCH_VALIDATION_ERROR, exception.getMessage());
+    }
+
+    /**
+     * Generate a list of ReplicationType with random ordering
+     *
+     * @return List of ReplicationType values
+     */
+    private List<ReplicationType> getRandomReplicationTypesAsList() {
+        List<ReplicationType> replicationStrategies = List.of(ReplicationType.SEGMENT, ReplicationType.DOCUMENT);
+        int randomReplicationIndex = random().nextInt(replicationStrategies.size());
+        ReplicationType clusterLevelReplication = replicationStrategies.get(randomReplicationIndex);
+        ReplicationType indexLevelReplication = replicationStrategies.get(1 - randomReplicationIndex);
+        return List.of(clusterLevelReplication, indexLevelReplication);
+    }
 }
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.java
index c2ce7e48f92d2..2c12c0abb202b 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/SegmentReplicationSnapshotIT.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REPLICATION_TYPE;
+import static org.opensearch.indices.IndicesService.CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING;
 import static org.opensearch.indices.IndicesService.CLUSTER_SETTING_REPLICATION_TYPE;
 import static org.opensearch.indices.replication.SegmentReplicationBaseIT.waitForSearchableDocs;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
@@ -47,6 +48,9 @@ public class SegmentReplicationSnapshotIT extends AbstractSnapshotIntegTestCase
     private static final String REPOSITORY_NAME = "test-segrep-repo";
     private static final String SNAPSHOT_NAME = "test-segrep-snapshot";
 
+    protected static final String REPLICATION_MISMATCH_VALIDATION_ERROR =
+        "Validation Failed: 1: index setting [index.replication.type] is not allowed to be set as [cluster.index.restrict.replication.type=true];";
+
     public Settings segRepEnableIndexSettings() {
         return getShardSettings().put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT).build();
     }
@@ -306,4 +310,63 @@ public void testSnapshotRestoreOnIndexWithSegRepClusterSetting() throws Exceptio
         IndicesService indicesService = internalCluster().getInstance(IndicesService.class);
         assertEquals(indicesService.indexService(index).getIndexSettings().isSegRepEnabled(), false);
     }
+
+    /**
+    * 1. Create index in DOCUMENT replication type
+    * 2. Snapshot index
+    * 3. Add new set of nodes with `cluster.indices.replication.strategy` set to SEGMENT and `cluster.index.restrict.replication.type`
+    *    set to true.
+    * 4. Perform restore on new set of nodes to validate restored index has `DOCUMENT` replication.
+    */
+    public void testSnapshotRestoreOnRestrictReplicationSetting() throws Exception {
+        final int documentCount = scaledRandomIntBetween(1, 10);
+        String originalClusterManagerNode = internalCluster().startClusterManagerOnlyNode();
+
+        // Starting two nodes with primary and replica shards respectively.
+        final String primaryNode = internalCluster().startDataOnlyNode();
+        prepareCreate(
+            INDEX_NAME,
+            Settings.builder()
+                // we want to override cluster replication setting by passing a index replication setting
+                .put(IndexMetadata.SETTING_REPLICATION_TYPE, ReplicationType.DOCUMENT)
+                .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, REPLICA_COUNT)
+                .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, SHARD_COUNT)
+        ).get();
+        ensureYellowAndNoInitializingShards(INDEX_NAME);
+        final String replicaNode = internalCluster().startDataOnlyNode();
+        ensureGreen(INDEX_NAME);
+
+        for (int i = 0; i < documentCount; i++) {
+            client().prepareIndex(INDEX_NAME).setId(String.valueOf(i)).setSource("foo", "bar").get();
+        }
+
+        createSnapshot();
+
+        // Delete index
+        assertAcked(client().admin().indices().delete(new DeleteIndexRequest(INDEX_NAME)).get());
+        assertFalse("index [" + INDEX_NAME + "] should have been deleted", indexExists(INDEX_NAME));
+
+        // Start new set of nodes with cluster level replication type setting and restrict replication type setting.
+        Settings settings = Settings.builder()
+            .put(CLUSTER_SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT)
+            .put(CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING.getKey(), true)
+            .build();
+
+        // Start new cluster manager node
+        String newClusterManagerNode = internalCluster().startClusterManagerOnlyNode(settings);
+
+        // Remove older nodes
+        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(originalClusterManagerNode));
+        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(primaryNode));
+        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(replicaNode));
+
+        String newPrimaryNode = internalCluster().startDataOnlyNode(settings);
+        String newReplicaNode = internalCluster().startDataOnlyNode(settings);
+
+        // Perform snapshot restore
+        logger.info("--> Performing snapshot restore to target index");
+
+        IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> restoreSnapshotWithSettings(null));
+        assertEquals(REPLICATION_MISMATCH_VALIDATION_ERROR, exception.getMessage());
+    }
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoAction.java
index 55f75a142a53c..7e4911c10c50e 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoAction.java
@@ -44,7 +44,7 @@ public final class RemoteInfoAction extends ActionType<RemoteInfoResponse> {
     public static final String NAME = "cluster:monitor/remote/info";
     public static final RemoteInfoAction INSTANCE = new RemoteInfoAction();
 
-    public RemoteInfoAction() {
+    private RemoteInfoAction() {
         super(NAME, RemoteInfoResponse::new);
     }
 }
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java b/server/src/main/java/org/opensearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java
index 41225bc362235..04166c88a00ad 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java
@@ -195,7 +195,7 @@ void start() {
             } else {
                 for (Tuple<ShardId, String> shard : shards) {
                     InternalAsyncFetch fetch = new InternalAsyncFetch(logger, "shard_stores", shard.v1(), shard.v2(), listShardStoresInfo);
-                    fetch.fetchData(nodes, Collections.<String>emptySet());
+                    fetch.fetchData(nodes, Collections.emptyMap());
                 }
             }
         }
@@ -223,7 +223,7 @@ protected synchronized void processAsyncFetch(
                 List<FailedNodeException> failures,
                 long fetchingRound
             ) {
-                fetchResponses.add(new Response(shardId, responses, failures));
+                fetchResponses.add(new Response(shardAttributesMap.keySet().iterator().next(), responses, failures));
                 if (expectedOps.countDown()) {
                     finish();
                 }
@@ -312,7 +312,7 @@ private boolean shardExistsInNode(final NodeGatewayStartedShards response) {
             }
 
             @Override
-            protected void reroute(ShardId shardId, String reason) {
+            protected void reroute(String shardId, String reason) {
                 // no-op
             }
 
diff --git a/server/src/main/java/org/opensearch/action/main/MainAction.java b/server/src/main/java/org/opensearch/action/main/MainAction.java
index c5cbac824ec83..28a31a92d7f16 100644
--- a/server/src/main/java/org/opensearch/action/main/MainAction.java
+++ b/server/src/main/java/org/opensearch/action/main/MainAction.java
@@ -44,7 +44,7 @@ public class MainAction extends ActionType<MainResponse> {
     public static final String NAME = "cluster:monitor/main";
     public static final MainAction INSTANCE = new MainAction();
 
-    public MainAction() {
+    private MainAction() {
         super(NAME, MainResponse::new);
     }
 }
diff --git a/server/src/main/java/org/opensearch/action/search/PitService.java b/server/src/main/java/org/opensearch/action/search/PitService.java
index ed12938883e48..b6480ce63f827 100644
--- a/server/src/main/java/org/opensearch/action/search/PitService.java
+++ b/server/src/main/java/org/opensearch/action/search/PitService.java
@@ -71,6 +71,7 @@ public void deletePitContexts(
     ) {
         if (nodeToContextsMap.size() == 0) {
             listener.onResponse(new DeletePitResponse(Collections.emptyList()));
+            return;
         }
         final Set<String> clusters = nodeToContextsMap.values()
             .stream()
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
index 2704dccd46076..3384393d8feaf 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
@@ -891,7 +891,7 @@ static Settings aggregateIndexSettings(
         indexSettingsBuilder.put(IndexMetadata.SETTING_INDEX_PROVIDED_NAME, request.getProvidedName());
         indexSettingsBuilder.put(SETTING_INDEX_UUID, UUIDs.randomBase64UUID());
 
-        updateReplicationStrategy(indexSettingsBuilder, request.settings(), settings);
+        updateReplicationStrategy(indexSettingsBuilder, request.settings(), settings, combinedTemplateSettings);
         updateRemoteStoreSettings(indexSettingsBuilder, settings);
 
         if (sourceMetadata != null) {
@@ -907,6 +907,10 @@ static Settings aggregateIndexSettings(
             );
         }
 
+        List<String> validationErrors = new ArrayList<>();
+        validateIndexReplicationTypeSettings(indexSettingsBuilder.build(), clusterSettings).ifPresent(validationErrors::add);
+        validateErrors(request.index(), validationErrors);
+
         Settings indexSettings = indexSettingsBuilder.build();
         /*
          * We can not validate settings until we have applied templates, otherwise we do not know the actual settings
@@ -934,17 +938,33 @@ static Settings aggregateIndexSettings(
      * @param settingsBuilder index settings builder to be updated with relevant settings
      * @param requestSettings settings passed in during index create request
      * @param clusterSettings cluster level settings
+     * @param combinedTemplateSettings combined template settings which satisfy the index
      */
-    private static void updateReplicationStrategy(Settings.Builder settingsBuilder, Settings requestSettings, Settings clusterSettings) {
+    private static void updateReplicationStrategy(
+        Settings.Builder settingsBuilder,
+        Settings requestSettings,
+        Settings clusterSettings,
+        Settings combinedTemplateSettings
+    ) {
+        // The replication setting is applied in the following order:
+        // 1. Explicit index creation request parameter
+        // 2. Template property for replication type
+        // 3. Defaults to segment if remote store attributes on the cluster
+        // 4. Default cluster level setting
+
+        final ReplicationType indexReplicationType;
         if (INDEX_REPLICATION_TYPE_SETTING.exists(requestSettings)) {
-            settingsBuilder.put(SETTING_REPLICATION_TYPE, INDEX_REPLICATION_TYPE_SETTING.get(requestSettings));
+            indexReplicationType = INDEX_REPLICATION_TYPE_SETTING.get(requestSettings);
+        } else if (INDEX_REPLICATION_TYPE_SETTING.exists(combinedTemplateSettings)) {
+            indexReplicationType = INDEX_REPLICATION_TYPE_SETTING.get(combinedTemplateSettings);
         } else if (CLUSTER_REPLICATION_TYPE_SETTING.exists(clusterSettings)) {
-            settingsBuilder.put(SETTING_REPLICATION_TYPE, CLUSTER_REPLICATION_TYPE_SETTING.get(clusterSettings));
+            indexReplicationType = CLUSTER_REPLICATION_TYPE_SETTING.get(clusterSettings);
         } else if (isRemoteStoreAttributePresent(clusterSettings)) {
-            settingsBuilder.put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT);
+            indexReplicationType = ReplicationType.SEGMENT;
         } else {
-            settingsBuilder.put(SETTING_REPLICATION_TYPE, CLUSTER_REPLICATION_TYPE_SETTING.getDefault(clusterSettings));
+            indexReplicationType = CLUSTER_REPLICATION_TYPE_SETTING.getDefault(clusterSettings);
         }
+        settingsBuilder.put(SETTING_REPLICATION_TYPE, indexReplicationType);
     }
 
     /**
@@ -1230,7 +1250,11 @@ private void validate(CreateIndexClusterStateUpdateRequest request, ClusterState
     public void validateIndexSettings(String indexName, final Settings settings, final boolean forbidPrivateIndexSettings)
         throws IndexCreationException {
         List<String> validationErrors = getIndexSettingsValidationErrors(settings, forbidPrivateIndexSettings, indexName);
+        validateIndexReplicationTypeSettings(settings, clusterService.getClusterSettings()).ifPresent(validationErrors::add);
+        validateErrors(indexName, validationErrors);
+    }
 
+    private static void validateErrors(String indexName, List<String> validationErrors) {
         if (validationErrors.isEmpty() == false) {
             ValidationException validationException = new ValidationException();
             validationException.addValidationErrors(validationErrors);
@@ -1306,6 +1330,27 @@ private static List<String> validateIndexCustomPath(Settings settings, @Nullable
         return validationErrors;
     }
 
+    /**
+     * Validates {@code index.replication.type} is matches with cluster level setting {@code cluster.indices.replication.strategy}
+     * when {@code cluster.index.restrict.replication.type} is set to true.
+     *
+     * @param requestSettings settings passed in during index create request
+     * @param clusterSettings cluster setting
+     */
+    private static Optional<String> validateIndexReplicationTypeSettings(Settings requestSettings, ClusterSettings clusterSettings) {
+        if (clusterSettings.get(IndicesService.CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING)
+            && requestSettings.hasValue(SETTING_REPLICATION_TYPE)
+            && requestSettings.get(INDEX_REPLICATION_TYPE_SETTING.getKey())
+                .equals(clusterSettings.get(CLUSTER_REPLICATION_TYPE_SETTING).name()) == false) {
+            return Optional.of(
+                "index setting [index.replication.type] is not allowed to be set as ["
+                    + IndicesService.CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING.getKey()
+                    + "=true]"
+            );
+        }
+        return Optional.empty();
+    }
+
     /**
      * Validates the settings and mappings for shrinking an index.
      *
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/TargetPoolAllocationDecider.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/TargetPoolAllocationDecider.java
index c11f5823cf3a7..76f9f44077ad8 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/TargetPoolAllocationDecider.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/TargetPoolAllocationDecider.java
@@ -44,7 +44,7 @@ public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, Routing
             return allocation.decision(
                 Decision.NO,
                 NAME,
-                "Routing pools are incompatible. Shard pool: [%s], Node Pool: [%s]",
+                "Routing pools are incompatible. Shard pool: [%s], node pool: [%s]",
                 shardPool,
                 targetNodePool
             );
@@ -56,21 +56,21 @@ public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, Routing
                     shardRouting,
                     shardPool,
                     node.node(),
-                    DiscoveryNodeRole.DATA_ROLE
+                    DiscoveryNodeRole.DATA_ROLE.roleName()
                 );
                 return allocation.decision(
                     Decision.NO,
                     NAME,
-                    "Routing pools are incompatible. Shard pool: [{}], Node Pool: [{}] without [{}] role",
+                    "Routing pools are incompatible. Shard pool: [%s], node pool: [%s] without [%s] role",
                     shardPool,
                     targetNodePool,
-                    DiscoveryNodeRole.DATA_ROLE
+                    DiscoveryNodeRole.DATA_ROLE.roleName()
                 );
             }
         return allocation.decision(
             Decision.YES,
             NAME,
-            "Routing pools are compatible. Shard pool: [%s], Node Pool: [%s]",
+            "Routing pools are compatible. Shard pool: [%s], node pool: [%s]",
             shardPool,
             targetNodePool
         );
@@ -106,7 +106,7 @@ private Decision canAllocateInTargetPool(IndexMetadata indexMetadata, DiscoveryN
             return allocation.decision(
                 Decision.NO,
                 NAME,
-                "Routing pools are incompatible. Index pool: [%s], Node Pool: [%s]",
+                "Routing pools are incompatible. Index pool: [%s], node pool: [%s]",
                 indexPool,
                 targetNodePool
             );
@@ -118,21 +118,21 @@ private Decision canAllocateInTargetPool(IndexMetadata indexMetadata, DiscoveryN
                     indexMetadata.getIndex().getName(),
                     indexPool,
                     node,
-                    DiscoveryNodeRole.DATA_ROLE
+                    DiscoveryNodeRole.DATA_ROLE.roleName()
                 );
                 return allocation.decision(
                     Decision.NO,
                     NAME,
-                    "Routing pools are incompatible. Index pool: [{}], Node Pool: [{}] without [{}] role",
+                    "Routing pools are incompatible. Index pool: [%s], node pool: [%s] without [%s] role",
                     indexPool,
                     targetNodePool,
-                    DiscoveryNodeRole.DATA_ROLE
+                    DiscoveryNodeRole.DATA_ROLE.roleName()
                 );
             }
         return allocation.decision(
             Decision.YES,
             NAME,
-            "Routing pools are compatible. Index pool: [%s], Node Pool: [%s]",
+            "Routing pools are compatible. Index pool: [%s], node pool: [%s]",
             indexPool,
             targetNodePool
         );
diff --git a/server/src/main/java/org/opensearch/common/StreamContext.java b/server/src/main/java/org/opensearch/common/StreamContext.java
index b163ba65dc7db..47a3d2b8571ea 100644
--- a/server/src/main/java/org/opensearch/common/StreamContext.java
+++ b/server/src/main/java/org/opensearch/common/StreamContext.java
@@ -57,6 +57,8 @@ protected StreamContext(StreamContext streamContext) {
     /**
      * Vendor plugins can use this method to create new streams only when they are required for processing
      * New streams won't be created till this method is called with the specific <code>partNumber</code>
+     * It is the responsibility of caller to ensure that stream is properly closed after consumption
+     * otherwise it can leak resources.
      *
      * @param partNumber The index of the part
      * @return A stream reference to the part requested
diff --git a/server/src/main/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainer.java b/server/src/main/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainer.java
index 5808f51f01efc..2047c99d9e13b 100644
--- a/server/src/main/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainer.java
+++ b/server/src/main/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainer.java
@@ -19,6 +19,7 @@
 import org.opensearch.common.blobstore.stream.write.WriteContext;
 import org.opensearch.common.blobstore.stream.write.WritePriority;
 import org.opensearch.common.blobstore.transfer.stream.OffsetRangeInputStream;
+import org.opensearch.common.blobstore.transfer.stream.RateLimitingOffsetRangeInputStream;
 import org.opensearch.common.blobstore.transfer.stream.ResettableCheckedInputStream;
 import org.opensearch.common.io.InputStreamContainer;
 import org.opensearch.common.util.ByteUtils;
@@ -27,6 +28,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
 import java.util.zip.CRC32;
 
 import com.jcraft.jzlib.JZlib;
@@ -43,7 +46,7 @@ public class RemoteTransferContainer implements Closeable {
     private long lastPartSize;
 
     private final long contentLength;
-    private final SetOnce<InputStream[]> inputStreams = new SetOnce<>();
+    private final SetOnce<Supplier<Long>[]> checksumSuppliers = new SetOnce<>();
     private final String fileName;
     private final String remoteFileName;
     private final boolean failTransferIfFileExists;
@@ -51,6 +54,7 @@ public class RemoteTransferContainer implements Closeable {
     private final long expectedChecksum;
     private final OffsetRangeInputStreamSupplier offsetRangeInputStreamSupplier;
     private final boolean isRemoteDataIntegritySupported;
+    private final AtomicBoolean readBlock = new AtomicBoolean();
 
     private static final Logger log = LogManager.getLogger(RemoteTransferContainer.class);
 
@@ -120,23 +124,24 @@ StreamContext supplyStreamContext(long partSize) {
         }
     }
 
+    @SuppressWarnings({ "unchecked" })
     private StreamContext openMultipartStreams(long partSize) throws IOException {
-        if (inputStreams.get() != null) {
+        if (checksumSuppliers.get() != null) {
             throw new IOException("Multi-part streams are already created.");
         }
 
         this.partSize = partSize;
         this.lastPartSize = (contentLength % partSize) != 0 ? contentLength % partSize : partSize;
         this.numberOfParts = (int) ((contentLength % partSize) == 0 ? contentLength / partSize : (contentLength / partSize) + 1);
-        InputStream[] streams = new InputStream[numberOfParts];
-        inputStreams.set(streams);
+        Supplier<Long>[] suppliers = new Supplier[numberOfParts];
+        checksumSuppliers.set(suppliers);
 
         return new StreamContext(getTransferPartStreamSupplier(), partSize, lastPartSize, numberOfParts);
     }
 
     private CheckedTriFunction<Integer, Long, Long, InputStreamContainer, IOException> getTransferPartStreamSupplier() {
         return ((partNo, size, position) -> {
-            assert inputStreams.get() != null : "expected inputStreams to be initialised";
+            assert checksumSuppliers.get() != null : "expected container to be initialised";
             return getMultipartStreamSupplier(partNo, size, position).get();
         });
     }
@@ -160,10 +165,21 @@ private LocalStreamSupplier<InputStreamContainer> getMultipartStreamSupplier(
         return () -> {
             try {
                 OffsetRangeInputStream offsetRangeInputStream = offsetRangeInputStreamSupplier.get(size, position);
-                InputStream inputStream = !isRemoteDataIntegrityCheckPossible()
-                    ? new ResettableCheckedInputStream(offsetRangeInputStream, fileName)
-                    : offsetRangeInputStream;
-                Objects.requireNonNull(inputStreams.get())[streamIdx] = inputStream;
+                if (offsetRangeInputStream instanceof RateLimitingOffsetRangeInputStream) {
+                    RateLimitingOffsetRangeInputStream rangeIndexInputStream = (RateLimitingOffsetRangeInputStream) offsetRangeInputStream;
+                    rangeIndexInputStream.setReadBlock(readBlock);
+                }
+                InputStream inputStream;
+                if (isRemoteDataIntegrityCheckPossible() == false) {
+                    ResettableCheckedInputStream resettableCheckedInputStream = new ResettableCheckedInputStream(
+                        offsetRangeInputStream,
+                        fileName
+                    );
+                    Objects.requireNonNull(checksumSuppliers.get())[streamIdx] = resettableCheckedInputStream::getChecksum;
+                    inputStream = resettableCheckedInputStream;
+                } else {
+                    inputStream = offsetRangeInputStream;
+                }
 
                 return new InputStreamContainer(inputStream, size, position);
             } catch (IOException e) {
@@ -205,20 +221,14 @@ public long getContentLength() {
         return contentLength;
     }
 
-    private long getInputStreamChecksum(InputStream inputStream) {
-        assert inputStream instanceof ResettableCheckedInputStream
-            : "expected passed inputStream to be instance of ResettableCheckedInputStream";
-        return ((ResettableCheckedInputStream) inputStream).getChecksum();
-    }
-
     private long getActualChecksum() {
-        InputStream[] currentInputStreams = Objects.requireNonNull(inputStreams.get());
-        long checksum = getInputStreamChecksum(currentInputStreams[0]);
-        for (int checkSumIdx = 1; checkSumIdx < Objects.requireNonNull(inputStreams.get()).length - 1; checkSumIdx++) {
-            checksum = JZlib.crc32_combine(checksum, getInputStreamChecksum(currentInputStreams[checkSumIdx]), partSize);
+        Supplier<Long>[] ckSumSuppliers = Objects.requireNonNull(checksumSuppliers.get());
+        long checksum = ckSumSuppliers[0].get();
+        for (int checkSumIdx = 1; checkSumIdx < ckSumSuppliers.length - 1; checkSumIdx++) {
+            checksum = JZlib.crc32_combine(checksum, ckSumSuppliers[checkSumIdx].get(), partSize);
         }
         if (numberOfParts > 1) {
-            checksum = JZlib.crc32_combine(checksum, getInputStreamChecksum(currentInputStreams[numberOfParts - 1]), lastPartSize);
+            checksum = JZlib.crc32_combine(checksum, ckSumSuppliers[numberOfParts - 1].get(), lastPartSize);
         }
 
         return checksum;
@@ -226,27 +236,8 @@ private long getActualChecksum() {
 
     @Override
     public void close() throws IOException {
-        if (inputStreams.get() == null) {
-            log.warn("Input streams cannot be closed since they are not yet set for multi stream upload");
-            return;
-        }
-
-        boolean closeStreamException = false;
-        for (InputStream is : Objects.requireNonNull(inputStreams.get())) {
-            try {
-                if (is != null) {
-                    is.close();
-                }
-            } catch (IOException ex) {
-                closeStreamException = true;
-                // Attempting to close all streams first before throwing exception.
-                log.error("Multipart stream failed to close ", ex);
-            }
-        }
-
-        if (closeStreamException) {
-            throw new IOException("Closure of some of the multi-part streams failed.");
-        }
+        // Setting a read block on all streams ever created by the container.
+        readBlock.set(true);
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/OffsetRangeIndexInputStream.java b/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/OffsetRangeIndexInputStream.java
index 7518f9ac569b9..520c838ba8a81 100644
--- a/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/OffsetRangeIndexInputStream.java
+++ b/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/OffsetRangeIndexInputStream.java
@@ -8,10 +8,16 @@
 
 package org.opensearch.common.blobstore.transfer.stream;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.store.IndexInput;
+import org.opensearch.common.concurrent.RefCountedReleasable;
 import org.opensearch.common.lucene.store.InputStreamIndexInput;
+import org.opensearch.common.util.concurrent.RunOnce;
 
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * OffsetRangeIndexInputStream extends InputStream to read from a specified offset using IndexInput
@@ -19,9 +25,12 @@
  * @opensearch.internal
  */
 public class OffsetRangeIndexInputStream extends OffsetRangeInputStream {
-
+    private static final Logger logger = LogManager.getLogger(OffsetRangeIndexInputStream.class);
     private final InputStreamIndexInput inputStreamIndexInput;
     private final IndexInput indexInput;
+    private AtomicBoolean readBlock;
+    private final OffsetRangeRefCount offsetRangeRefCount;
+    private final RunOnce closeOnce;
 
     /**
      * Construct a new OffsetRangeIndexInputStream object
@@ -35,16 +44,68 @@ public OffsetRangeIndexInputStream(IndexInput indexInput, long size, long positi
         indexInput.seek(position);
         this.indexInput = indexInput;
         this.inputStreamIndexInput = new InputStreamIndexInput(indexInput, size);
+        ClosingStreams closingStreams = new ClosingStreams(inputStreamIndexInput, indexInput);
+        offsetRangeRefCount = new OffsetRangeRefCount(closingStreams);
+        closeOnce = new RunOnce(offsetRangeRefCount::decRef);
+    }
+
+    @Override
+    public void setReadBlock(AtomicBoolean readBlock) {
+        this.readBlock = readBlock;
     }
 
     @Override
     public int read(byte[] b, int off, int len) throws IOException {
-        return inputStreamIndexInput.read(b, off, len);
+        // There are two levels of check to ensure that we don't read an already closed stream and
+        // to not close the stream if it is already being read.
+        // 1. First check is a coarse-grained check outside reference check which allows us to fail fast if read
+        // was invoked after the stream was closed. We need a separate atomic boolean closed because we don't want a
+        // future read to succeed when #close has been invoked even if there are on-going reads. On-going reads would
+        // hold reference and since ref count will not be 0 even after close was invoked, future reads will go through
+        // without a check on closed. Also, we do need to set closed externally. It is shared across all streams of the
+        // file. Check on closed in this class makes sure that no other stream allows subsequent reads. closed is
+        // being set to true in RemoteTransferContainer#close which is invoked when we are done processing all
+        // parts/file. Processing completes when either all parts are completed successfully or if either of the parts
+        // failed. In successful case, subsequent read will anyway not go through since all streams would have been
+        // consumed fully but in case of failure, SDK can continue to invoke read and this would be a wasted compute
+        // and IO.
+        // 2. In second check, a tryIncRef is invoked which tries to increment reference under lock and fails if ref
+        // is already closed. If reference is successfully obtained by the stream then stream will not be closed.
+        // Ref counting ensures that stream isn't closed in between reads.
+        //
+        // All these protection mechanisms are required in order to prevent invalid access to streams happening
+        // from the new S3 async SDK.
+        ensureReadable();
+        try (OffsetRangeRefCount ignored = getStreamReference()) {
+            return inputStreamIndexInput.read(b, off, len);
+        }
+    }
+
+    private OffsetRangeRefCount getStreamReference() {
+        boolean successIncrement = offsetRangeRefCount.tryIncRef();
+        if (successIncrement == false) {
+            throw alreadyClosed("OffsetRangeIndexInputStream is already unreferenced.");
+        }
+        return offsetRangeRefCount;
+    }
+
+    private void ensureReadable() {
+        if (readBlock != null && readBlock.get() == true) {
+            logger.debug("Read attempted on a stream which was read blocked!");
+            throw alreadyClosed("Read blocked stream.");
+        }
+    }
+
+    AlreadyClosedException alreadyClosed(String msg) {
+        return new AlreadyClosedException(msg + this);
     }
 
     @Override
     public int read() throws IOException {
-        return inputStreamIndexInput.read();
+        ensureReadable();
+        try (OffsetRangeRefCount ignored = getStreamReference()) {
+            return inputStreamIndexInput.read();
+        }
     }
 
     @Override
@@ -67,9 +128,42 @@ public long getFilePointer() throws IOException {
         return indexInput.getFilePointer();
     }
 
+    @Override
+    public String toString() {
+        return "OffsetRangeIndexInputStream{" + "indexInput=" + indexInput + ", readBlock=" + readBlock + '}';
+    }
+
+    private static class ClosingStreams {
+        private final InputStreamIndexInput inputStreamIndexInput;
+        private final IndexInput indexInput;
+
+        public ClosingStreams(InputStreamIndexInput inputStreamIndexInput, IndexInput indexInput) {
+            this.inputStreamIndexInput = inputStreamIndexInput;
+            this.indexInput = indexInput;
+        }
+    }
+
+    private static class OffsetRangeRefCount extends RefCountedReleasable<ClosingStreams> {
+        private static final Logger logger = LogManager.getLogger(OffsetRangeRefCount.class);
+
+        public OffsetRangeRefCount(ClosingStreams ref) {
+            super("OffsetRangeRefCount", ref, () -> {
+                try {
+                    ref.inputStreamIndexInput.close();
+                } catch (IOException ex) {
+                    logger.error("Failed to close indexStreamIndexInput", ex);
+                }
+                try {
+                    ref.indexInput.close();
+                } catch (IOException ex) {
+                    logger.error("Failed to close indexInput", ex);
+                }
+            });
+        }
+    }
+
     @Override
     public void close() throws IOException {
-        inputStreamIndexInput.close();
-        indexInput.close();
+        closeOnce.run();
     }
 }
diff --git a/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/OffsetRangeInputStream.java b/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/OffsetRangeInputStream.java
index e8b889db1f3b0..eacb972586a5a 100644
--- a/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/OffsetRangeInputStream.java
+++ b/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/OffsetRangeInputStream.java
@@ -10,6 +10,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * OffsetRangeInputStream is an abstract class that extends from {@link InputStream}
@@ -19,4 +20,8 @@
  */
 public abstract class OffsetRangeInputStream extends InputStream {
     public abstract long getFilePointer() throws IOException;
+
+    public void setReadBlock(AtomicBoolean readBlock) {
+        // Nothing
+    }
 }
diff --git a/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/RateLimitingOffsetRangeInputStream.java b/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/RateLimitingOffsetRangeInputStream.java
index b455999bbed0c..4a511ca1ac155 100644
--- a/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/RateLimitingOffsetRangeInputStream.java
+++ b/server/src/main/java/org/opensearch/common/blobstore/transfer/stream/RateLimitingOffsetRangeInputStream.java
@@ -12,6 +12,7 @@
 import org.opensearch.common.StreamLimiter;
 
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
 /**
@@ -40,6 +41,10 @@ public RateLimitingOffsetRangeInputStream(
         this.delegate = delegate;
     }
 
+    public void setReadBlock(AtomicBoolean readBlock) {
+        delegate.setReadBlock(readBlock);
+    }
+
     @Override
     public int read() throws IOException {
         int b = delegate.read();
diff --git a/server/src/main/java/org/opensearch/common/lucene/store/ByteArrayIndexInput.java b/server/src/main/java/org/opensearch/common/lucene/store/ByteArrayIndexInput.java
index 6eb613daf5133..bb273b14c42e2 100644
--- a/server/src/main/java/org/opensearch/common/lucene/store/ByteArrayIndexInput.java
+++ b/server/src/main/java/org/opensearch/common/lucene/store/ByteArrayIndexInput.java
@@ -33,6 +33,7 @@
 
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.RandomAccessInput;
+import org.apache.lucene.util.BitUtil;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -121,47 +122,25 @@ public void readBytes(final byte[] b, final int offset, int len) throws IOExcept
     @Override
     public byte readByte(long pos) throws IOException {
         validatePos(pos, Byte.BYTES);
-        return internalReadByte(pos);
+        return bytes[offset + (int) pos];
     }
 
     @Override
     public short readShort(long pos) throws IOException {
         validatePos(pos, Short.BYTES);
-        return internalReadShort(pos);
+        return (short) BitUtil.VH_LE_SHORT.get(bytes, offset + (int) pos);
     }
 
     @Override
     public int readInt(long pos) throws IOException {
         validatePos(pos, Integer.BYTES);
-        return internalReadInt(pos);
+        return (int) BitUtil.VH_LE_INT.get(bytes, offset + (int) pos);
     }
 
     @Override
     public long readLong(long pos) throws IOException {
         validatePos(pos, Long.BYTES);
-        return internalReadLong(pos);
-    }
-
-    private byte internalReadByte(long pos) {
-        return bytes[offset + (int) pos];
-    }
-
-    private short internalReadShort(long pos) {
-        final byte p1 = internalReadByte(pos);
-        final byte p2 = internalReadByte(pos + 1);
-        return (short) (((p2 & 0xFF) << 8) | (p1 & 0xFF));
-    }
-
-    private int internalReadInt(long pos) {
-        final short p1 = internalReadShort(pos);
-        final short p2 = internalReadShort(pos + Short.BYTES);
-        return ((p2 & 0xFFFF) << 16) | (p1 & 0xFFFF);
-    }
-
-    public long internalReadLong(long pos) {
-        final int p1 = internalReadInt(pos);
-        final int p2 = internalReadInt(pos + Integer.BYTES);
-        return (((long) p2) << 32) | (p1 & 0xFFFFFFFFL);
+        return (long) BitUtil.VH_LE_LONG.get(bytes, offset + (int) pos);
     }
 
     private void validatePos(long pos, int len) throws EOFException {
diff --git a/server/src/main/java/org/opensearch/common/network/NetworkModule.java b/server/src/main/java/org/opensearch/common/network/NetworkModule.java
index 2edf3967c61b0..f97d5b2f80eeb 100644
--- a/server/src/main/java/org/opensearch/common/network/NetworkModule.java
+++ b/server/src/main/java/org/opensearch/common/network/NetworkModule.java
@@ -309,7 +309,7 @@ public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(
          * @param actualHandler The handler itself that implements the request handling
          * @param admissionControlActionType Admission control based on resource usage limits of provided action type
          * @return returns the actual TransportRequestHandler after intercepting all previous handlers
-         * @param <T>
+         * @param <T> transport request type
          */
         @Override
         public <T extends TransportRequest> TransportRequestHandler<T> interceptHandler(
diff --git a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java
index ab0ea89f4734d..fa4b0f475edc5 100644
--- a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java
+++ b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java
@@ -701,7 +701,8 @@ public void apply(Settings value, Settings current, Settings previous) {
                 AdmissionControlSettings.ADMISSION_CONTROL_TRANSPORT_LAYER_MODE,
                 CpuBasedAdmissionControllerSettings.CPU_BASED_ADMISSION_CONTROLLER_TRANSPORT_LAYER_MODE,
                 CpuBasedAdmissionControllerSettings.INDEXING_CPU_USAGE_LIMIT,
-                CpuBasedAdmissionControllerSettings.SEARCH_CPU_USAGE_LIMIT
+                CpuBasedAdmissionControllerSettings.SEARCH_CPU_USAGE_LIMIT,
+                IndicesService.CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING
             )
         )
     );
diff --git a/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java b/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
index d0ade4eb25168..50774f7e0cb1c 100644
--- a/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
+++ b/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
@@ -46,6 +46,7 @@
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.core.index.shard.ShardId;
+import org.opensearch.indices.store.ShardAttributes;
 import org.opensearch.transport.ReceiveTimeoutTransportException;
 
 import java.util.ArrayList;
@@ -54,12 +55,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static java.util.Collections.emptySet;
-import static java.util.Collections.unmodifiableSet;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.unmodifiableMap;
 
 /**
  * Allows to asynchronously fetch shard related data from other nodes for allocation, without blocking
@@ -69,6 +69,7 @@
  * and once the results are back, it makes sure to schedule a reroute to make sure those results will
  * be taken into account.
  *
+ * It comes in two modes, to single fetch a shard or fetch a batch of shards.
  * @opensearch.internal
  */
 public abstract class AsyncShardFetch<T extends BaseNodeResponse> implements Releasable {
@@ -77,18 +78,21 @@ public abstract class AsyncShardFetch<T extends BaseNodeResponse> implements Rel
      * An action that lists the relevant shard data that needs to be fetched.
      */
     public interface Lister<NodesResponse extends BaseNodesResponse<NodeResponse>, NodeResponse extends BaseNodeResponse> {
-        void list(ShardId shardId, @Nullable String customDataPath, DiscoveryNode[] nodes, ActionListener<NodesResponse> listener);
+        void list(Map<ShardId, ShardAttributes> shardAttributesMap, DiscoveryNode[] nodes, ActionListener<NodesResponse> listener);
+
     }
 
     protected final Logger logger;
     protected final String type;
-    protected final ShardId shardId;
-    protected final String customDataPath;
+    protected final Map<ShardId, ShardAttributes> shardAttributesMap;
     private final Lister<BaseNodesResponse<T>, T> action;
     private final Map<String, NodeEntry<T>> cache = new HashMap<>();
-    private final Set<String> nodesToIgnore = new HashSet<>();
     private final AtomicLong round = new AtomicLong();
     private boolean closed;
+    private final String reroutingKey;
+    private final Map<ShardId, Set<String>> shardToIgnoreNodes = new HashMap<>();
+
+    private final boolean enableBatchMode;
 
     @SuppressWarnings("unchecked")
     protected AsyncShardFetch(
@@ -100,9 +104,36 @@ protected AsyncShardFetch(
     ) {
         this.logger = logger;
         this.type = type;
-        this.shardId = Objects.requireNonNull(shardId);
-        this.customDataPath = Objects.requireNonNull(customDataPath);
+        shardAttributesMap = new HashMap<>();
+        shardAttributesMap.put(shardId, new ShardAttributes(shardId, customDataPath));
+        this.action = (Lister<BaseNodesResponse<T>, T>) action;
+        this.reroutingKey = "ShardId=[" + shardId.toString() + "]";
+        enableBatchMode = false;
+    }
+
+    /**
+     * Added to fetch a batch of shards from nodes
+     *
+     * @param logger Logger
+     * @param type type of action
+     * @param shardAttributesMap Map of {@link ShardId} to {@link ShardAttributes} to perform fetching on them a
+     * @param action Transport Action
+     * @param batchId For the given ShardAttributesMap, we expect them to tie with a single batch id for logging and later identification
+     */
+    @SuppressWarnings("unchecked")
+    protected AsyncShardFetch(
+        Logger logger,
+        String type,
+        Map<ShardId, ShardAttributes> shardAttributesMap,
+        Lister<? extends BaseNodesResponse<T>, T> action,
+        String batchId
+    ) {
+        this.logger = logger;
+        this.type = type;
+        this.shardAttributesMap = shardAttributesMap;
         this.action = (Lister<BaseNodesResponse<T>, T>) action;
+        this.reroutingKey = "BatchID=[" + batchId + "]";
+        enableBatchMode = true;
     }
 
     @Override
@@ -130,11 +161,32 @@ public synchronized int getNumberOfInFlightFetches() {
      * The ignoreNodes are nodes that are supposed to be ignored for this round, since fetching is async, we need
      * to keep them around and make sure we add them back when all the responses are fetched and returned.
      */
-    public synchronized FetchResult<T> fetchData(DiscoveryNodes nodes, Set<String> ignoreNodes) {
+    public synchronized FetchResult<T> fetchData(DiscoveryNodes nodes, Map<ShardId, Set<String>> ignoreNodes) {
         if (closed) {
-            throw new IllegalStateException(shardId + ": can't fetch data on closed async fetch");
+            throw new IllegalStateException(reroutingKey + ": can't fetch data on closed async fetch");
         }
-        nodesToIgnore.addAll(ignoreNodes);
+
+        if (enableBatchMode == false) {
+            // we will do assertions here on ignoreNodes
+            if (ignoreNodes.size() > 1) {
+                throw new IllegalStateException(
+                    "Fetching Shard Data, " + reroutingKey + "Can only have atmost one shard" + "for non-batch mode"
+                );
+            }
+            if (ignoreNodes.size() == 1) {
+                if (shardAttributesMap.containsKey(ignoreNodes.keySet().iterator().next()) == false) {
+                    throw new IllegalStateException("Shard Id must be same as initialized in AsyncShardFetch. Expecting = " + reroutingKey);
+                }
+            }
+        }
+
+        // add the nodes to ignore to the list of nodes to ignore for each shard
+        for (Map.Entry<ShardId, Set<String>> ignoreNodesEntry : ignoreNodes.entrySet()) {
+            Set<String> ignoreNodesSet = shardToIgnoreNodes.getOrDefault(ignoreNodesEntry.getKey(), new HashSet<>());
+            ignoreNodesSet.addAll(ignoreNodesEntry.getValue());
+            shardToIgnoreNodes.put(ignoreNodesEntry.getKey(), ignoreNodesSet);
+        }
+
         fillShardCacheWithDataNodes(cache, nodes);
         List<NodeEntry<T>> nodesToFetch = findNodesToFetch(cache);
         if (nodesToFetch.isEmpty() == false) {
@@ -153,7 +205,7 @@ public synchronized FetchResult<T> fetchData(DiscoveryNodes nodes, Set<String> i
 
         // if we are still fetching, return null to indicate it
         if (hasAnyNodeFetching(cache)) {
-            return new FetchResult<>(shardId, null, emptySet());
+            return new FetchResult<>(null, emptyMap());
         } else {
             // nothing to fetch, yay, build the return value
             Map<DiscoveryNode, T> fetchData = new HashMap<>();
@@ -177,16 +229,27 @@ public synchronized FetchResult<T> fetchData(DiscoveryNodes nodes, Set<String> i
                     }
                 }
             }
-            Set<String> allIgnoreNodes = unmodifiableSet(new HashSet<>(nodesToIgnore));
+
+            Map<ShardId, Set<String>> allIgnoreNodesMap = unmodifiableMap(new HashMap<>(shardToIgnoreNodes));
             // clear the nodes to ignore, we had a successful run in fetching everything we can
             // we need to try them if another full run is needed
-            nodesToIgnore.clear();
+            shardToIgnoreNodes.clear();
             // if at least one node failed, make sure to have a protective reroute
             // here, just case this round won't find anything, and we need to retry fetching data
-            if (failedNodes.isEmpty() == false || allIgnoreNodes.isEmpty() == false) {
-                reroute(shardId, "nodes failed [" + failedNodes.size() + "], ignored [" + allIgnoreNodes.size() + "]");
+
+            if (failedNodes.isEmpty() == false
+                || allIgnoreNodesMap.values().stream().anyMatch(ignoreNodeSet -> ignoreNodeSet.isEmpty() == false)) {
+                reroute(
+                    reroutingKey,
+                    "nodes failed ["
+                        + failedNodes.size()
+                        + "], ignored ["
+                        + allIgnoreNodesMap.values().stream().mapToInt(Set::size).sum()
+                        + "]"
+                );
             }
-            return new FetchResult<>(shardId, fetchData, allIgnoreNodes);
+
+            return new FetchResult<>(fetchData, allIgnoreNodesMap);
         }
     }
 
@@ -199,10 +262,10 @@ public synchronized FetchResult<T> fetchData(DiscoveryNodes nodes, Set<String> i
     protected synchronized void processAsyncFetch(List<T> responses, List<FailedNodeException> failures, long fetchingRound) {
         if (closed) {
             // we are closed, no need to process this async fetch at all
-            logger.trace("{} ignoring fetched [{}] results, already closed", shardId, type);
+            logger.trace("{} ignoring fetched [{}] results, already closed", reroutingKey, type);
             return;
         }
-        logger.trace("{} processing fetched [{}] results", shardId, type);
+        logger.trace("{} processing fetched [{}] results", reroutingKey, type);
 
         if (responses != null) {
             for (T response : responses) {
@@ -212,7 +275,7 @@ protected synchronized void processAsyncFetch(List<T> responses, List<FailedNode
                         assert nodeEntry.getFetchingRound() > fetchingRound : "node entries only replaced by newer rounds";
                         logger.trace(
                             "{} received response for [{}] from node {} for an older fetching round (expected: {} but was: {})",
-                            shardId,
+                            reroutingKey,
                             nodeEntry.getNodeId(),
                             type,
                             nodeEntry.getFetchingRound(),
@@ -221,14 +284,14 @@ protected synchronized void processAsyncFetch(List<T> responses, List<FailedNode
                     } else if (nodeEntry.isFailed()) {
                         logger.trace(
                             "{} node {} has failed for [{}] (failure [{}])",
-                            shardId,
+                            reroutingKey,
                             nodeEntry.getNodeId(),
                             type,
                             nodeEntry.getFailure()
                         );
                     } else {
                         // if the entry is there, for the right fetching round and not marked as failed already, process it
-                        logger.trace("{} marking {} as done for [{}], result is [{}]", shardId, nodeEntry.getNodeId(), type, response);
+                        logger.trace("{} marking {} as done for [{}], result is [{}]", reroutingKey, nodeEntry.getNodeId(), type, response);
                         nodeEntry.doneFetching(response);
                     }
                 }
@@ -236,14 +299,14 @@ protected synchronized void processAsyncFetch(List<T> responses, List<FailedNode
         }
         if (failures != null) {
             for (FailedNodeException failure : failures) {
-                logger.trace("{} processing failure {} for [{}]", shardId, failure, type);
+                logger.trace("{} processing failure {} for [{}]", reroutingKey, failure, type);
                 NodeEntry<T> nodeEntry = cache.get(failure.nodeId());
                 if (nodeEntry != null) {
                     if (nodeEntry.getFetchingRound() != fetchingRound) {
                         assert nodeEntry.getFetchingRound() > fetchingRound : "node entries only replaced by newer rounds";
                         logger.trace(
                             "{} received failure for [{}] from node {} for an older fetching round (expected: {} but was: {})",
-                            shardId,
+                            reroutingKey,
                             nodeEntry.getNodeId(),
                             type,
                             nodeEntry.getFetchingRound(),
@@ -261,7 +324,7 @@ protected synchronized void processAsyncFetch(List<T> responses, List<FailedNode
                             logger.warn(
                                 () -> new ParameterizedMessage(
                                     "{}: failed to list shard for {} on node [{}]",
-                                    shardId,
+                                    reroutingKey,
                                     type,
                                     failure.nodeId()
                                 ),
@@ -273,13 +336,13 @@ protected synchronized void processAsyncFetch(List<T> responses, List<FailedNode
                 }
             }
         }
-        reroute(shardId, "post_response");
+        reroute(reroutingKey, "post_response");
     }
 
     /**
      * Implement this in order to scheduled another round that causes a call to fetch data.
      */
-    protected abstract void reroute(ShardId shardId, String reason);
+    protected abstract void reroute(String reroutingKey, String reason);
 
     /**
      * Clear cache for node, ensuring next fetch will fetch a fresh copy.
@@ -334,8 +397,8 @@ private boolean hasAnyNodeFetching(Map<String, NodeEntry<T>> shardCache) {
      */
     // visible for testing
     void asyncFetch(final DiscoveryNode[] nodes, long fetchingRound) {
-        logger.trace("{} fetching [{}] from {}", shardId, type, nodes);
-        action.list(shardId, customDataPath, nodes, new ActionListener<BaseNodesResponse<T>>() {
+        logger.trace("{} fetching [{}] from {}", reroutingKey, type, nodes);
+        action.list(shardAttributesMap, nodes, new ActionListener<BaseNodesResponse<T>>() {
             @Override
             public void onResponse(BaseNodesResponse<T> response) {
                 processAsyncFetch(response.getNodes(), response.failures(), fetchingRound);
@@ -358,14 +421,12 @@ public void onFailure(Exception e) {
      */
     public static class FetchResult<T extends BaseNodeResponse> {
 
-        private final ShardId shardId;
         private final Map<DiscoveryNode, T> data;
-        private final Set<String> ignoreNodes;
+        private final Map<ShardId, Set<String>> ignoredShardToNodes;
 
-        public FetchResult(ShardId shardId, Map<DiscoveryNode, T> data, Set<String> ignoreNodes) {
-            this.shardId = shardId;
+        public FetchResult(Map<DiscoveryNode, T> data, Map<ShardId, Set<String>> ignoreNodes) {
             this.data = data;
-            this.ignoreNodes = ignoreNodes;
+            this.ignoredShardToNodes = ignoreNodes;
         }
 
         /**
@@ -389,9 +450,14 @@ public Map<DiscoveryNode, T> getData() {
          * Process any changes needed to the allocation based on this fetch result.
          */
         public void processAllocation(RoutingAllocation allocation) {
-            for (String ignoreNode : ignoreNodes) {
-                allocation.addIgnoreShardForNode(shardId, ignoreNode);
+            for (Map.Entry<ShardId, Set<String>> entry : ignoredShardToNodes.entrySet()) {
+                ShardId shardId = entry.getKey();
+                Set<String> ignoreNodes = entry.getValue();
+                if (ignoreNodes.isEmpty() == false) {
+                    ignoreNodes.forEach(nodeId -> allocation.addIgnoreShardForNode(shardId, nodeId));
+                }
             }
+
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/gateway/GatewayAllocator.java b/server/src/main/java/org/opensearch/gateway/GatewayAllocator.java
index b5a00b1a47523..c8ef9364ebba9 100644
--- a/server/src/main/java/org/opensearch/gateway/GatewayAllocator.java
+++ b/server/src/main/java/org/opensearch/gateway/GatewayAllocator.java
@@ -56,6 +56,7 @@
 import org.opensearch.indices.store.TransportNodesListShardStoreMetadata;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.Spliterators;
@@ -226,7 +227,9 @@ private static void clearCacheForPrimary(
         AsyncShardFetch<TransportNodesListShardStoreMetadata.NodeStoreFilesMetadata> fetch,
         RoutingAllocation allocation
     ) {
-        ShardRouting primary = allocation.routingNodes().activePrimary(fetch.shardId);
+        assert fetch.shardAttributesMap.size() == 1 : "expected only one shard";
+        ShardId shardId = fetch.shardAttributesMap.keySet().iterator().next();
+        ShardRouting primary = allocation.routingNodes().activePrimary(shardId);
         if (primary != null) {
             fetch.clearCacheForNode(primary.currentNodeId());
         }
@@ -254,15 +257,15 @@ class InternalAsyncFetch<T extends BaseNodeResponse> extends AsyncShardFetch<T>
         }
 
         @Override
-        protected void reroute(ShardId shardId, String reason) {
-            logger.trace("{} scheduling reroute for {}", shardId, reason);
+        protected void reroute(String reroutingKey, String reason) {
+            logger.trace("{} scheduling reroute for {}", reroutingKey, reason);
             assert rerouteService != null;
             rerouteService.reroute(
                 "async_shard_fetch",
                 Priority.HIGH,
                 ActionListener.wrap(
-                    r -> logger.trace("{} scheduled reroute completed for {}", shardId, reason),
-                    e -> logger.debug(new ParameterizedMessage("{} scheduled reroute failed for {}", shardId, reason), e)
+                    r -> logger.trace("{} scheduled reroute completed for {}", reroutingKey, reason),
+                    e -> logger.debug(new ParameterizedMessage("{} scheduled reroute failed for {}", reroutingKey, reason), e)
                 )
             );
         }
@@ -293,7 +296,11 @@ protected AsyncShardFetch.FetchResult<TransportNodesListGatewayStartedShards.Nod
             );
             AsyncShardFetch.FetchResult<TransportNodesListGatewayStartedShards.NodeGatewayStartedShards> shardState = fetch.fetchData(
                 allocation.nodes(),
-                allocation.getIgnoreNodes(shard.shardId())
+                new HashMap<>() {
+                    {
+                        put(shard.shardId(), allocation.getIgnoreNodes(shard.shardId()));
+                    }
+                }
             );
 
             if (shardState.hasData()) {
@@ -328,7 +335,11 @@ protected AsyncShardFetch.FetchResult<TransportNodesListShardStoreMetadata.NodeS
             );
             AsyncShardFetch.FetchResult<TransportNodesListShardStoreMetadata.NodeStoreFilesMetadata> shardStores = fetch.fetchData(
                 allocation.nodes(),
-                allocation.getIgnoreNodes(shard.shardId())
+                new HashMap<>() {
+                    {
+                        put(shard.shardId(), allocation.getIgnoreNodes(shard.shardId()));
+                    }
+                }
             );
             if (shardStores.hasData()) {
                 shardStores.processAllocation(allocation);
diff --git a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
index a47893f37a97c..601a5c671d67c 100644
--- a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
+++ b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
@@ -62,12 +62,14 @@
 import org.opensearch.index.store.Store;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.indices.replication.checkpoint.ReplicationCheckpoint;
+import org.opensearch.indices.store.ShardAttributes;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.TransportRequest;
 import org.opensearch.transport.TransportService;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -124,7 +126,14 @@ public TransportNodesListGatewayStartedShards(
     }
 
     @Override
-    public void list(ShardId shardId, String customDataPath, DiscoveryNode[] nodes, ActionListener<NodesGatewayStartedShards> listener) {
+    public void list(
+        Map<ShardId, ShardAttributes> shardAttributesMap,
+        DiscoveryNode[] nodes,
+        ActionListener<NodesGatewayStartedShards> listener
+    ) {
+        assert shardAttributesMap.size() == 1 : "only one shard should be specified";
+        final ShardId shardId = shardAttributesMap.keySet().iterator().next();
+        final String customDataPath = shardAttributesMap.get(shardId).getCustomDataPath();
         execute(new Request(shardId, customDataPath, nodes), listener);
     }
 
diff --git a/server/src/main/java/org/opensearch/index/engine/IndexVersionValue.java b/server/src/main/java/org/opensearch/index/engine/IndexVersionValue.java
index 803d106a2f25e..c297022f5766d 100644
--- a/server/src/main/java/org/opensearch/index/engine/IndexVersionValue.java
+++ b/server/src/main/java/org/opensearch/index/engine/IndexVersionValue.java
@@ -45,6 +45,7 @@
 final class IndexVersionValue extends VersionValue {
 
     private static final long RAM_BYTES_USED = RamUsageEstimator.shallowSizeOfInstance(IndexVersionValue.class);
+    private static final long TRANSLOG_LOC_RAM_BYTES_USED = RamUsageEstimator.shallowSizeOfInstance(Translog.Location.class);
 
     private final Translog.Location translogLocation;
 
@@ -55,7 +56,7 @@ final class IndexVersionValue extends VersionValue {
 
     @Override
     public long ramBytesUsed() {
-        return RAM_BYTES_USED + RamUsageEstimator.shallowSizeOf(translogLocation);
+        return RAM_BYTES_USED + (translogLocation == null ? 0L : TRANSLOG_LOC_RAM_BYTES_USED);
     }
 
     @Override
diff --git a/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java b/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java
index da62ddfd7017d..66d4654e543a2 100644
--- a/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java
+++ b/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java
@@ -359,18 +359,31 @@ public Query phraseQuery(TokenStream stream, int slop, boolean enablePositionInc
         );
     }
 
+    public Query phraseQuery(TokenStream stream, int slop, boolean enablePositionIncrements, QueryShardContext context) throws IOException {
+        return phraseQuery(stream, slop, enablePositionIncrements);
+    }
+
     public Query multiPhraseQuery(TokenStream stream, int slop, boolean enablePositionIncrements) throws IOException {
         throw new IllegalArgumentException(
             "Can only use phrase queries on text fields - not on [" + name + "] which is of type [" + typeName() + "]"
         );
     }
 
+    public Query multiPhraseQuery(TokenStream stream, int slop, boolean enablePositionIncrements, QueryShardContext context)
+        throws IOException {
+        return multiPhraseQuery(stream, slop, enablePositionIncrements);
+    }
+
     public Query phrasePrefixQuery(TokenStream stream, int slop, int maxExpansions) throws IOException {
         throw new IllegalArgumentException(
             "Can only use phrase prefix queries on text fields - not on [" + name + "] which is of type [" + typeName() + "]"
         );
     }
 
+    public Query phrasePrefixQuery(TokenStream stream, int slop, int maxExpansions, QueryShardContext context) throws IOException {
+        return phrasePrefixQuery(stream, slop, maxExpansions);
+    }
+
     public SpanQuery spanPrefixQuery(String value, SpanMultiTermQueryWrapper.SpanRewriteMethod method, QueryShardContext context) {
         throw new IllegalArgumentException(
             "Can only use span prefix queries on text fields - not on [" + name + "] which is of type [" + typeName() + "]"
diff --git a/server/src/main/java/org/opensearch/index/mapper/MatchOnlyTextFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/MatchOnlyTextFieldMapper.java
new file mode 100644
index 0000000000000..fb97f8c309a70
--- /dev/null
+++ b/server/src/main/java/org/opensearch/index/mapper/MatchOnlyTextFieldMapper.java
@@ -0,0 +1,312 @@
+/*
+ * 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.mapper;
+
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.index.IndexOptions;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.MultiPhraseQuery;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
+import org.opensearch.Version;
+import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.query.SourceFieldMatchQuery;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+/**
+ * A specialized type of TextFieldMapper which disables the positions and norms to save on storage and executes phrase queries, which requires
+ * positional data, in a slightly less efficient manner using the {@link  org.opensearch.index.query.SourceFieldMatchQuery}.
+ */
+public class MatchOnlyTextFieldMapper extends TextFieldMapper {
+
+    public static final FieldType FIELD_TYPE = new FieldType();
+    public static final String CONTENT_TYPE = "match_only_text";
+    private final String indexOptions = FieldMapper.indexOptionToString(FIELD_TYPE.indexOptions());
+    private final boolean norms = FIELD_TYPE.omitNorms() == false;
+
+    @Override
+    protected String contentType() {
+        return CONTENT_TYPE;
+    }
+
+    static {
+        FIELD_TYPE.setTokenized(true);
+        FIELD_TYPE.setStored(false);
+        FIELD_TYPE.setStoreTermVectors(false);
+        FIELD_TYPE.setOmitNorms(true);
+        FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
+        FIELD_TYPE.freeze();
+    }
+
+    public static final TypeParser PARSER = new TypeParser((n, c) -> new Builder(n, c.indexVersionCreated(), c.getIndexAnalyzers()));
+
+    protected MatchOnlyTextFieldMapper(
+        String simpleName,
+        FieldType fieldType,
+        MatchOnlyTextFieldType mappedFieldType,
+        TextFieldMapper.PrefixFieldMapper prefixFieldMapper,
+        TextFieldMapper.PhraseFieldMapper phraseFieldMapper,
+        MultiFields multiFields,
+        CopyTo copyTo,
+        Builder builder
+    ) {
+
+        super(simpleName, fieldType, mappedFieldType, prefixFieldMapper, phraseFieldMapper, multiFields, copyTo, builder);
+    }
+
+    @Override
+    public ParametrizedFieldMapper.Builder getMergeBuilder() {
+        return new Builder(simpleName(), this.indexCreatedVersion, this.indexAnalyzers).init(this);
+    }
+
+    /**
+     * Builder class for constructing the MatchOnlyTextFieldMapper.
+     */
+    public static class Builder extends TextFieldMapper.Builder {
+        final Parameter<String> indexOptions = indexOptions(m -> ((MatchOnlyTextFieldMapper) m).indexOptions);
+
+        private static Parameter<String> indexOptions(Function<FieldMapper, String> initializer) {
+            return Parameter.restrictedStringParam("index_options", false, initializer, "docs");
+        }
+
+        final Parameter<Boolean> norms = norms(m -> ((MatchOnlyTextFieldMapper) m).norms);
+        final Parameter<Boolean> indexPhrases = Parameter.boolParam(
+            "index_phrases",
+            false,
+            m -> ((MatchOnlyTextFieldType) m.mappedFieldType).indexPhrases,
+            false
+        ).setValidator(v -> {
+            if (v == true) {
+                throw new MapperParsingException("Index phrases cannot be enabled on for match_only_text field. Use text field instead");
+            }
+        });
+
+        final Parameter<PrefixConfig> indexPrefixes = new Parameter<>(
+            "index_prefixes",
+            false,
+            () -> null,
+            TextFieldMapper::parsePrefixConfig,
+            m -> Optional.ofNullable(((MatchOnlyTextFieldType) m.mappedFieldType).prefixFieldType)
+                .map(p -> new PrefixConfig(p.minChars, p.maxChars))
+                .orElse(null)
+        ).acceptsNull().setValidator(v -> {
+            if (v != null) {
+                throw new MapperParsingException("Index prefixes cannot be enabled on for match_only_text field. Use text field instead");
+            }
+        });
+
+        private static Parameter<Boolean> norms(Function<FieldMapper, Boolean> initializer) {
+            return Parameter.boolParam("norms", false, initializer, false)
+                .setMergeValidator((o, n) -> o == n || (o && n == false))
+                .setValidator(v -> {
+                    if (v == true) {
+                        throw new MapperParsingException("Norms cannot be enabled on for match_only_text field");
+                    }
+                });
+        }
+
+        public Builder(String name, IndexAnalyzers indexAnalyzers) {
+            super(name, indexAnalyzers);
+        }
+
+        public Builder(String name, Version indexCreatedVersion, IndexAnalyzers indexAnalyzers) {
+            super(name, indexCreatedVersion, indexAnalyzers);
+        }
+
+        @Override
+        public MatchOnlyTextFieldMapper build(BuilderContext context) {
+            FieldType fieldType = TextParams.buildFieldType(index, store, indexOptions, norms, termVectors);
+            MatchOnlyTextFieldType tft = buildFieldType(fieldType, context);
+            return new MatchOnlyTextFieldMapper(
+                name,
+                fieldType,
+                tft,
+                buildPrefixMapper(context, fieldType, tft),
+                buildPhraseMapper(fieldType, tft),
+                multiFieldsBuilder.build(this, context),
+                copyTo.build(),
+                this
+            );
+        }
+
+        @Override
+        protected MatchOnlyTextFieldType buildFieldType(FieldType fieldType, BuilderContext context) {
+            NamedAnalyzer indexAnalyzer = analyzers.getIndexAnalyzer();
+            NamedAnalyzer searchAnalyzer = analyzers.getSearchAnalyzer();
+            NamedAnalyzer searchQuoteAnalyzer = analyzers.getSearchQuoteAnalyzer();
+
+            if (fieldType.indexOptions().compareTo(IndexOptions.DOCS) > 0) {
+                throw new IllegalArgumentException("Cannot set position_increment_gap on field [" + name + "] without positions enabled");
+            }
+            if (positionIncrementGap.get() != POSITION_INCREMENT_GAP_USE_ANALYZER) {
+                if (fieldType.indexOptions().compareTo(IndexOptions.DOCS) < 0) {
+                    throw new IllegalArgumentException(
+                        "Cannot set position_increment_gap on field [" + name + "] without indexing enabled"
+                    );
+                }
+                indexAnalyzer = new NamedAnalyzer(indexAnalyzer, positionIncrementGap.get());
+                searchAnalyzer = new NamedAnalyzer(searchAnalyzer, positionIncrementGap.get());
+                searchQuoteAnalyzer = new NamedAnalyzer(searchQuoteAnalyzer, positionIncrementGap.get());
+            }
+            TextSearchInfo tsi = new TextSearchInfo(fieldType, similarity.getValue(), searchAnalyzer, searchQuoteAnalyzer);
+            MatchOnlyTextFieldType ft = new MatchOnlyTextFieldType(
+                buildFullName(context),
+                index.getValue(),
+                fieldType.stored(),
+                tsi,
+                meta.getValue()
+            );
+            ft.setIndexAnalyzer(indexAnalyzer);
+            ft.setEagerGlobalOrdinals(eagerGlobalOrdinals.getValue());
+            ft.setBoost(boost.getValue());
+            if (fieldData.getValue()) {
+                ft.setFielddata(true, freqFilter.getValue());
+            }
+            return ft;
+        }
+
+        @Override
+        protected List<Parameter<?>> getParameters() {
+            return Arrays.asList(
+                index,
+                store,
+                indexOptions,
+                norms,
+                termVectors,
+                analyzers.indexAnalyzer,
+                analyzers.searchAnalyzer,
+                analyzers.searchQuoteAnalyzer,
+                similarity,
+                positionIncrementGap,
+                fieldData,
+                freqFilter,
+                eagerGlobalOrdinals,
+                indexPhrases,
+                indexPrefixes,
+                boost,
+                meta
+            );
+        }
+    }
+
+    /**
+     * The specific field type for MatchOnlyTextFieldMapper
+     *
+     * @opensearch.internal
+     */
+    public static final class MatchOnlyTextFieldType extends TextFieldType {
+        private final boolean indexPhrases = false;
+
+        private PrefixFieldType prefixFieldType;
+
+        @Override
+        public String typeName() {
+            return CONTENT_TYPE;
+        }
+
+        public MatchOnlyTextFieldType(String name, boolean indexed, boolean stored, TextSearchInfo tsi, Map<String, String> meta) {
+            super(name, indexed, stored, tsi, meta);
+        }
+
+        @Override
+        public Query phraseQuery(TokenStream stream, int slop, boolean enablePosIncrements, QueryShardContext context) throws IOException {
+            PhraseQuery phraseQuery = (PhraseQuery) super.phraseQuery(stream, slop, enablePosIncrements);
+            BooleanQuery.Builder builder = new BooleanQuery.Builder();
+            for (Term term : phraseQuery.getTerms()) {
+                builder.add(new TermQuery(term), BooleanClause.Occur.FILTER);
+            }
+            return new SourceFieldMatchQuery(builder.build(), phraseQuery, this, context);
+        }
+
+        @Override
+        public Query multiPhraseQuery(TokenStream stream, int slop, boolean enablePositionIncrements, QueryShardContext context)
+            throws IOException {
+            MultiPhraseQuery multiPhraseQuery = (MultiPhraseQuery) super.multiPhraseQuery(stream, slop, enablePositionIncrements);
+            BooleanQuery.Builder builder = new BooleanQuery.Builder();
+            for (Term[] terms : multiPhraseQuery.getTermArrays()) {
+                if (terms.length > 1) {
+                    // Multiple terms in the same position, creating a disjunction query for it and
+                    // adding it to conjunction query
+                    BooleanQuery.Builder disjunctions = new BooleanQuery.Builder();
+                    for (Term term : terms) {
+                        disjunctions.add(new TermQuery(term), BooleanClause.Occur.SHOULD);
+                    }
+                    builder.add(disjunctions.build(), BooleanClause.Occur.FILTER);
+                } else {
+                    builder.add(new TermQuery(terms[0]), BooleanClause.Occur.FILTER);
+                }
+            }
+            return new SourceFieldMatchQuery(builder.build(), multiPhraseQuery, this, context);
+        }
+
+        @Override
+        public Query phrasePrefixQuery(TokenStream stream, int slop, int maxExpansions, QueryShardContext context) throws IOException {
+            Query phrasePrefixQuery = super.phrasePrefixQuery(stream, slop, maxExpansions);
+            List<List<Term>> termArray = getTermsFromTokenStream(stream);
+            BooleanQuery.Builder builder = new BooleanQuery.Builder();
+            for (int i = 0; i < termArray.size(); i++) {
+                if (i == termArray.size() - 1) {
+                    // last element of the term Array is a prefix, thus creating a prefix query for it and adding it to
+                    // conjunction query
+                    MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery(name());
+                    mqb.add(termArray.get(i).toArray(new Term[0]));
+                    builder.add(mqb, BooleanClause.Occur.FILTER);
+                } else {
+                    if (termArray.get(i).size() > 1) {
+                        // multiple terms in the same position, creating a disjunction query for it and
+                        // adding it to conjunction query
+                        BooleanQuery.Builder disjunctions = new BooleanQuery.Builder();
+                        for (Term term : termArray.get(i)) {
+                            disjunctions.add(new TermQuery(term), BooleanClause.Occur.SHOULD);
+                        }
+                        builder.add(disjunctions.build(), BooleanClause.Occur.FILTER);
+                    } else {
+                        builder.add(new TermQuery(termArray.get(i).get(0)), BooleanClause.Occur.FILTER);
+                    }
+                }
+            }
+            return new SourceFieldMatchQuery(builder.build(), phrasePrefixQuery, this, context);
+        }
+
+        private List<List<Term>> getTermsFromTokenStream(TokenStream stream) throws IOException {
+            final List<List<Term>> termArray = new ArrayList<>();
+            TermToBytesRefAttribute termAtt = stream.getAttribute(TermToBytesRefAttribute.class);
+            PositionIncrementAttribute posIncrAtt = stream.getAttribute(PositionIncrementAttribute.class);
+            List<Term> currentTerms = new ArrayList<>();
+            stream.reset();
+            while (stream.incrementToken()) {
+                if (posIncrAtt.getPositionIncrement() != 0) {
+                    if (currentTerms.isEmpty() == false) {
+                        termArray.add(List.copyOf(currentTerms));
+                    }
+                    currentTerms.clear();
+                }
+                currentTerms.add(new Term(name(), termAtt.getBytesRef()));
+            }
+            termArray.add(List.copyOf(currentTerms));
+            return termArray;
+        }
+    }
+}
diff --git a/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java
index ee0b50024ab38..f4723b6178137 100644
--- a/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java
@@ -36,7 +36,6 @@
 import org.opensearch.Version;
 import org.opensearch.common.Explicit;
 import org.opensearch.common.TriFunction;
-import org.opensearch.common.annotation.InternalApi;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
@@ -154,16 +153,20 @@ protected void doXContentBody(XContentBuilder builder, boolean includeDefaults,
 
     /**
      * Serializes a parameter
+     *
+     * @opensearch.api
      */
-    @InternalApi
+    @PublicApi(since = "1.0.0")
     protected interface Serializer<T> {
         void serialize(XContentBuilder builder, String name, T value) throws IOException;
     }
 
     /**
      * Check on whether or not a parameter should be serialized
+     *
+     * @opensearch.api
      */
-    @InternalApi
+    @PublicApi(since = "1.0.0")
     protected interface SerializerCheck<T> {
         /**
          * Check on whether or not a parameter should be serialized
diff --git a/server/src/main/java/org/opensearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/TextFieldMapper.java
index 1d0d1ae2bd899..d0e041e68a81d 100644
--- a/server/src/main/java/org/opensearch/index/mapper/TextFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/TextFieldMapper.java
@@ -110,7 +110,7 @@
 public class TextFieldMapper extends ParametrizedFieldMapper {
 
     public static final String CONTENT_TYPE = "text";
-    private static final int POSITION_INCREMENT_GAP_USE_ANALYZER = -1;
+    protected static final int POSITION_INCREMENT_GAP_USE_ANALYZER = -1;
     private static final String FAST_PHRASE_SUFFIX = "._index_phrase";
 
     /**
@@ -152,11 +152,11 @@ private static TextFieldMapper toType(FieldMapper in) {
      *
      * @opensearch.internal
      */
-    private static final class PrefixConfig implements ToXContent {
+    protected static final class PrefixConfig implements ToXContent {
         final int minChars;
         final int maxChars;
 
-        private PrefixConfig(int minChars, int maxChars) {
+        PrefixConfig(int minChars, int maxChars) {
             this.minChars = minChars;
             this.maxChars = maxChars;
             if (minChars > maxChars) {
@@ -198,7 +198,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
     }
 
-    private static PrefixConfig parsePrefixConfig(String propName, ParserContext parserContext, Object propNode) {
+    static PrefixConfig parsePrefixConfig(String propName, ParserContext parserContext, Object propNode) {
         if (propNode == null) {
             return null;
         }
@@ -214,7 +214,7 @@ private static PrefixConfig parsePrefixConfig(String propName, ParserContext par
      *
      * @opensearch.internal
      */
-    private static final class FielddataFrequencyFilter implements ToXContent {
+    protected static final class FielddataFrequencyFilter implements ToXContent {
         final double minFreq;
         final double maxFreq;
         final int minSegmentSize;
@@ -280,15 +280,14 @@ public static class Builder extends ParametrizedFieldMapper.Builder {
 
         private final Version indexCreatedVersion;
 
-        private final Parameter<Boolean> index = Parameter.indexParam(m -> toType(m).mappedFieldType.isSearchable(), true);
-        private final Parameter<Boolean> store = Parameter.storeParam(m -> toType(m).fieldType.stored(), false);
+        protected final Parameter<Boolean> index = Parameter.indexParam(m -> toType(m).mappedFieldType.isSearchable(), true);
+        protected final Parameter<Boolean> store = Parameter.storeParam(m -> toType(m).fieldType.stored(), false);
 
         final Parameter<SimilarityProvider> similarity = TextParams.similarity(m -> toType(m).similarity);
 
         final Parameter<String> indexOptions = TextParams.indexOptions(m -> toType(m).indexOptions);
         final Parameter<Boolean> norms = TextParams.norms(true, m -> toType(m).fieldType.omitNorms() == false);
         final Parameter<String> termVectors = TextParams.termVectors(m -> toType(m).termVectors);
-
         final Parameter<Integer> positionIncrementGap = Parameter.intParam(
             "position_increment_gap",
             false,
@@ -332,8 +331,8 @@ public static class Builder extends ParametrizedFieldMapper.Builder {
                 .orElse(null)
         ).acceptsNull();
 
-        private final Parameter<Float> boost = Parameter.boostParam();
-        private final Parameter<Map<String, String>> meta = Parameter.metaParam();
+        protected final Parameter<Float> boost = Parameter.boostParam();
+        protected final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
         final TextParams.Analyzers analyzers;
 
@@ -395,7 +394,7 @@ protected List<Parameter<?>> getParameters() {
             );
         }
 
-        private TextFieldType buildFieldType(FieldType fieldType, BuilderContext context) {
+        protected TextFieldType buildFieldType(FieldType fieldType, BuilderContext context) {
             NamedAnalyzer indexAnalyzer = analyzers.getIndexAnalyzer();
             NamedAnalyzer searchAnalyzer = analyzers.getSearchAnalyzer();
             NamedAnalyzer searchQuoteAnalyzer = analyzers.getSearchQuoteAnalyzer();
@@ -420,7 +419,7 @@ private TextFieldType buildFieldType(FieldType fieldType, BuilderContext context
             return ft;
         }
 
-        private PrefixFieldMapper buildPrefixMapper(BuilderContext context, FieldType fieldType, TextFieldType tft) {
+        protected PrefixFieldMapper buildPrefixMapper(BuilderContext context, FieldType fieldType, TextFieldType tft) {
             if (indexPrefixes.get() == null) {
                 return null;
             }
@@ -454,7 +453,7 @@ private PrefixFieldMapper buildPrefixMapper(BuilderContext context, FieldType fi
             return new PrefixFieldMapper(pft, prefixFieldType);
         }
 
-        private PhraseFieldMapper buildPhraseMapper(FieldType fieldType, TextFieldType parent) {
+        protected PhraseFieldMapper buildPhraseMapper(FieldType fieldType, TextFieldType parent) {
             if (indexPhrases.get() == false) {
                 return null;
             }
@@ -683,7 +682,7 @@ public Query existsQuery(QueryShardContext context) {
      *
      * @opensearch.internal
      */
-    private static final class PhraseFieldMapper extends FieldMapper {
+    protected static final class PhraseFieldMapper extends FieldMapper {
 
         PhraseFieldMapper(FieldType fieldType, PhraseFieldType mappedFieldType) {
             super(mappedFieldType.name(), fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty());
@@ -710,7 +709,7 @@ protected String contentType() {
      *
      * @opensearch.internal
      */
-    private static final class PrefixFieldMapper extends FieldMapper {
+    protected static final class PrefixFieldMapper extends FieldMapper {
 
         protected PrefixFieldMapper(FieldType fieldType, PrefixFieldType mappedFieldType) {
             super(mappedFieldType.name(), fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty());
@@ -968,15 +967,15 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
 
     }
 
-    private final FieldType fieldType;
+    protected final FieldType fieldType;
     private final PrefixFieldMapper prefixFieldMapper;
     private final PhraseFieldMapper phraseFieldMapper;
     private final SimilarityProvider similarity;
     private final String indexOptions;
     private final String termVectors;
     private final int positionIncrementGap;
-    private final Version indexCreatedVersion;
-    private final IndexAnalyzers indexAnalyzers;
+    protected final Version indexCreatedVersion;
+    protected final IndexAnalyzers indexAnalyzers;
     private final FielddataFrequencyFilter freqFilter;
 
     protected TextFieldMapper(
diff --git a/server/src/main/java/org/opensearch/index/query/SourceFieldMatchQuery.java b/server/src/main/java/org/opensearch/index/query/SourceFieldMatchQuery.java
new file mode 100644
index 0000000000000..b0be20e417efe
--- /dev/null
+++ b/server/src/main/java/org/opensearch/index/query/SourceFieldMatchQuery.java
@@ -0,0 +1,160 @@
+/*
+ * 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.query;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.memory.MemoryIndex;
+import org.apache.lucene.search.ConstantScoreScorer;
+import org.apache.lucene.search.ConstantScoreWeight;
+import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.IndexSearcher;
+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.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.SourceValueFetcher;
+import org.opensearch.search.lookup.LeafSearchLookup;
+import org.opensearch.search.lookup.SearchLookup;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A query that matches against each document from the parent query by filtering using the source field values.
+ * Useful to query against field type which doesn't store positional data and field is not stored/computed dynamically.
+ */
+public class SourceFieldMatchQuery extends Query {
+    private final Query delegateQuery;
+    private final Query filter;
+    private final SearchLookup lookup;
+    private final MappedFieldType fieldType;
+    private final SourceValueFetcher valueFetcher;
+    private final QueryShardContext context;
+
+    /**
+     * Constructs a SourceFieldMatchQuery.
+     *
+     * @param delegateQuery The parent query to use to find matches.
+     * @param filter The query used to filter further by running against field value fetched using _source field.
+     * @param fieldType The mapped field type.
+     * @param context The QueryShardContext to get lookup and valueFetcher
+     */
+    public SourceFieldMatchQuery(Query delegateQuery, Query filter, MappedFieldType fieldType, QueryShardContext context) {
+        this.delegateQuery = delegateQuery;
+        this.filter = filter;
+        this.fieldType = fieldType;
+        this.context = context;
+        this.lookup = context.lookup();
+        if (!context.documentMapper("").sourceMapper().enabled()) {
+            throw new IllegalArgumentException(
+                "SourceFieldMatchQuery error: unable to fetch fields from _source field: _source is disabled in the mappings "
+                    + "for index ["
+                    + context.index().getName()
+                    + "]"
+            );
+        }
+        this.valueFetcher = (SourceValueFetcher) fieldType.valueFetcher(context, lookup, null);
+    }
+
+    @Override
+    public void visit(QueryVisitor visitor) {
+        delegateQuery.visit(visitor);
+    }
+
+    @Override
+    public Query rewrite(IndexSearcher indexSearcher) throws IOException {
+        Query rewritten = indexSearcher.rewrite(delegateQuery);
+        if (rewritten == delegateQuery) {
+            return this;
+        }
+        return new SourceFieldMatchQuery(rewritten, filter, fieldType, context);
+    }
+
+    @Override
+    public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost) throws IOException {
+
+        Weight weight = delegateQuery.createWeight(searcher, ScoreMode.TOP_DOCS, boost);
+
+        return new ConstantScoreWeight(this, boost) {
+
+            @Override
+            public Scorer scorer(LeafReaderContext context) throws IOException {
+
+                Scorer scorer = weight.scorer(context);
+                if (scorer == null) {
+                    // none of the docs are matching
+                    return null;
+                }
+                DocIdSetIterator approximation = scorer.iterator();
+                LeafSearchLookup leafSearchLookup = lookup.getLeafSearchLookup(context);
+                TwoPhaseIterator twoPhase = new TwoPhaseIterator(approximation) {
+
+                    @Override
+                    public boolean matches() {
+                        leafSearchLookup.setDocument(approximation.docID());
+                        List<Object> values = valueFetcher.fetchValues(leafSearchLookup.source());
+                        // Missing fields won't count as match. Can we use a default value for missing field?
+                        if (values.isEmpty()) {
+                            return false;
+                        }
+                        MemoryIndex memoryIndex = new MemoryIndex();
+                        for (Object value : values) {
+                            memoryIndex.addField(fieldType.name(), (String) value, fieldType.indexAnalyzer());
+                        }
+                        float score = memoryIndex.search(filter);
+                        return score > 0.0f;
+                    }
+
+                    @Override
+                    public float matchCost() {
+                        // arbitrary cost
+                        return 1000f;
+                    }
+                };
+                return new ConstantScoreScorer(this, score(), ScoreMode.TOP_DOCS, twoPhase);
+            }
+
+            @Override
+            public boolean isCacheable(LeafReaderContext ctx) {
+                // It is fine to cache if delegate query weight is cacheable since additional logic here
+                // is just a filter on top of delegate query matches
+                return weight.isCacheable(ctx);
+            }
+        };
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (sameClassAs(o) == false) {
+            return false;
+        }
+        SourceFieldMatchQuery other = (SourceFieldMatchQuery) o;
+        return Objects.equals(this.delegateQuery, other.delegateQuery)
+            && Objects.equals(this.filter, other.filter)
+            && Objects.equals(this.fieldType, other.fieldType)
+            && Objects.equals(this.context, other.context);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(classHash(), delegateQuery, filter, fieldType, context);
+    }
+
+    @Override
+    public String toString(String f) {
+        return "SourceFieldMatchQuery (delegate query: [ " + delegateQuery.toString(f) + " ], filter query: [ " + filter.toString(f) + "])";
+    }
+}
diff --git a/server/src/main/java/org/opensearch/index/search/MatchQuery.java b/server/src/main/java/org/opensearch/index/search/MatchQuery.java
index 9e2b79971369d..ec6755ea25703 100644
--- a/server/src/main/java/org/opensearch/index/search/MatchQuery.java
+++ b/server/src/main/java/org/opensearch/index/search/MatchQuery.java
@@ -67,6 +67,7 @@
 import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.index.mapper.KeywordFieldMapper;
 import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MatchOnlyTextFieldMapper;
 import org.opensearch.index.mapper.TextFieldMapper;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.index.query.support.QueryParsers;
@@ -701,7 +702,7 @@ private Query analyzeMultiBoolean(String field, TokenStream stream, BooleanClaus
         protected Query analyzePhrase(String field, TokenStream stream, int slop) throws IOException {
             try {
                 checkForPositions(field);
-                return fieldType.phraseQuery(stream, slop, enablePositionIncrements);
+                return fieldType.phraseQuery(stream, slop, enablePositionIncrements, context);
             } catch (IllegalArgumentException | IllegalStateException e) {
                 if (lenient) {
                     return newLenientFieldQuery(field, e);
@@ -714,7 +715,7 @@ protected Query analyzePhrase(String field, TokenStream stream, int slop) throws
         protected Query analyzeMultiPhrase(String field, TokenStream stream, int slop) throws IOException {
             try {
                 checkForPositions(field);
-                return fieldType.multiPhraseQuery(stream, slop, enablePositionIncrements);
+                return fieldType.multiPhraseQuery(stream, slop, enablePositionIncrements, context);
             } catch (IllegalArgumentException | IllegalStateException e) {
                 if (lenient) {
                     return newLenientFieldQuery(field, e);
@@ -728,7 +729,7 @@ private Query analyzePhrasePrefix(String field, TokenStream stream, int slop, in
                 if (positionCount > 1) {
                     checkForPositions(field);
                 }
-                return fieldType.phrasePrefixQuery(stream, slop, maxExpansions);
+                return fieldType.phrasePrefixQuery(stream, slop, maxExpansions, context);
             } catch (IllegalArgumentException | IllegalStateException e) {
                 if (lenient) {
                     return newLenientFieldQuery(field, e);
@@ -887,6 +888,9 @@ private Query analyzeGraphPhrase(TokenStream source, String field, Type type, in
 
         private void checkForPositions(String field) {
             if (fieldType.getTextSearchInfo().hasPositions() == false) {
+                if (fieldType instanceof MatchOnlyTextFieldMapper.MatchOnlyTextFieldType) {
+                    return;
+                }
                 throw new IllegalStateException("field:[" + field + "] was indexed without position data; cannot run PhraseQuery");
             }
         }
diff --git a/server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java b/server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java
index 241f05af2c512..8c0c87e8c9d0c 100644
--- a/server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java
+++ b/server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java
@@ -248,7 +248,7 @@ protected Query newPrefixQuery(Term term) {
         protected Query analyzePhrase(String field, TokenStream stream, int slop) throws IOException {
             List<Query> disjunctions = new ArrayList<>();
             for (FieldAndBoost fieldType : blendedFields) {
-                Query query = fieldType.fieldType.phraseQuery(stream, slop, enablePositionIncrements);
+                Query query = fieldType.fieldType.phraseQuery(stream, slop, enablePositionIncrements, context);
                 if (fieldType.boost != 1f) {
                     query = new BoostQuery(query, fieldType.boost);
                 }
@@ -261,7 +261,7 @@ protected Query analyzePhrase(String field, TokenStream stream, int slop) throws
         protected Query analyzeMultiPhrase(String field, TokenStream stream, int slop) throws IOException {
             List<Query> disjunctions = new ArrayList<>();
             for (FieldAndBoost fieldType : blendedFields) {
-                Query query = fieldType.fieldType.multiPhraseQuery(stream, slop, enablePositionIncrements);
+                Query query = fieldType.fieldType.multiPhraseQuery(stream, slop, enablePositionIncrements, context);
                 if (fieldType.boost != 1f) {
                     query = new BoostQuery(query, fieldType.boost);
                 }
diff --git a/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java b/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
index 7b57fabdf1486..9c1e902606cab 100644
--- a/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
+++ b/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
@@ -45,7 +45,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.NoSuchFileException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -781,6 +780,7 @@ public void deleteStaleSegments(int lastNMetadataFilesToKeep) throws IOException
                 segmentMetadataMap.values().stream().map(metadata -> metadata.uploadedFilename).collect(Collectors.toSet())
             );
         }
+        Set<String> deletedSegmentFiles = new HashSet<>();
         for (String metadataFile : metadataFilesToBeDeleted) {
             Map<String, UploadedSegmentMetadata> staleSegmentFilesMetadataMap = readMetadataFile(metadataFile).getMetadata();
             Set<String> staleSegmentRemoteFilenames = staleSegmentFilesMetadataMap.values()
@@ -788,31 +788,33 @@ public void deleteStaleSegments(int lastNMetadataFilesToKeep) throws IOException
                 .map(metadata -> metadata.uploadedFilename)
                 .collect(Collectors.toSet());
             AtomicBoolean deletionSuccessful = new AtomicBoolean(true);
-            List<String> nonActiveDeletedSegmentFiles = new ArrayList<>();
-            staleSegmentRemoteFilenames.stream().filter(file -> !activeSegmentRemoteFilenames.contains(file)).forEach(file -> {
-                try {
-                    remoteDataDirectory.deleteFile(file);
-                    nonActiveDeletedSegmentFiles.add(file);
-                    if (!activeSegmentFilesMetadataMap.containsKey(getLocalSegmentFilename(file))) {
-                        segmentsUploadedToRemoteStore.remove(getLocalSegmentFilename(file));
+            staleSegmentRemoteFilenames.stream()
+                .filter(file -> activeSegmentRemoteFilenames.contains(file) == false)
+                .filter(file -> deletedSegmentFiles.contains(file) == false)
+                .forEach(file -> {
+                    try {
+                        remoteDataDirectory.deleteFile(file);
+                        deletedSegmentFiles.add(file);
+                        if (!activeSegmentFilesMetadataMap.containsKey(getLocalSegmentFilename(file))) {
+                            segmentsUploadedToRemoteStore.remove(getLocalSegmentFilename(file));
+                        }
+                    } catch (NoSuchFileException e) {
+                        logger.info("Segment file {} corresponding to metadata file {} does not exist in remote", file, metadataFile);
+                    } catch (IOException e) {
+                        deletionSuccessful.set(false);
+                        logger.warn(
+                            "Exception while deleting segment file {} corresponding to metadata file {}. Deletion will be re-tried",
+                            file,
+                            metadataFile
+                        );
                     }
-                } catch (NoSuchFileException e) {
-                    logger.info("Segment file {} corresponding to metadata file {} does not exist in remote", file, metadataFile);
-                } catch (IOException e) {
-                    deletionSuccessful.set(false);
-                    logger.info(
-                        "Exception while deleting segment file {} corresponding to metadata file {}. Deletion will be re-tried",
-                        file,
-                        metadataFile
-                    );
-                }
-            });
-            logger.debug("nonActiveDeletedSegmentFiles={}", nonActiveDeletedSegmentFiles);
+                });
             if (deletionSuccessful.get()) {
                 logger.debug("Deleting stale metadata file {} from remote segment store", metadataFile);
                 remoteMetadataDirectory.deleteFile(metadataFile);
             }
         }
+        logger.debug("deletedSegmentFiles={}", deletedSegmentFiles);
     }
 
     public void deleteStaleSegmentsAsync(int lastNMetadataFilesToKeep) {
diff --git a/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamInput.java b/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamInput.java
index 8c9ccc3b487df..f75f27b7bcb91 100644
--- a/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamInput.java
+++ b/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamInput.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.translog;
 
 import org.apache.lucene.store.BufferedChecksum;
+import org.apache.lucene.util.BitUtil;
 import org.opensearch.core.common.io.stream.FilterStreamInput;
 import org.opensearch.core.common.io.stream.StreamInput;
 
@@ -92,22 +93,21 @@ public void readBytes(byte[] b, int offset, int len) throws IOException {
     public short readShort() throws IOException {
         final byte[] buf = buffer.get();
         readBytes(buf, 0, 2);
-        return (short) (((buf[0] & 0xFF) << 8) | (buf[1] & 0xFF));
+        return (short) BitUtil.VH_BE_SHORT.get(buf, 0);
     }
 
     @Override
     public int readInt() throws IOException {
         final byte[] buf = buffer.get();
         readBytes(buf, 0, 4);
-        return ((buf[0] & 0xFF) << 24) | ((buf[1] & 0xFF) << 16) | ((buf[2] & 0xFF) << 8) | (buf[3] & 0xFF);
+        return (int) BitUtil.VH_BE_INT.get(buf, 0);
     }
 
     @Override
     public long readLong() throws IOException {
         final byte[] buf = buffer.get();
         readBytes(buf, 0, 8);
-        return (((long) (((buf[0] & 0xFF) << 24) | ((buf[1] & 0xFF) << 16) | ((buf[2] & 0xFF) << 8) | (buf[3] & 0xFF))) << 32) | ((((buf[4]
-            & 0xFF) << 24) | ((buf[5] & 0xFF) << 16) | ((buf[6] & 0xFF) << 8) | (buf[7] & 0xFF)) & 0xFFFFFFFFL);
+        return (long) BitUtil.VH_BE_LONG.get(buf, 0);
     }
 
     @Override
diff --git a/server/src/main/java/org/opensearch/indices/IndicesModule.java b/server/src/main/java/org/opensearch/indices/IndicesModule.java
index 5c2137ec742a4..eea5dbbf57f6c 100644
--- a/server/src/main/java/org/opensearch/indices/IndicesModule.java
+++ b/server/src/main/java/org/opensearch/indices/IndicesModule.java
@@ -59,6 +59,7 @@
 import org.opensearch.index.mapper.IpFieldMapper;
 import org.opensearch.index.mapper.KeywordFieldMapper;
 import org.opensearch.index.mapper.Mapper;
+import org.opensearch.index.mapper.MatchOnlyTextFieldMapper;
 import org.opensearch.index.mapper.MetadataFieldMapper;
 import org.opensearch.index.mapper.NestedPathFieldMapper;
 import org.opensearch.index.mapper.NumberFieldMapper;
@@ -158,6 +159,7 @@ public static Map<String, Mapper.TypeParser> getMappers(List<MapperPlugin> mappe
         mappers.put(nanoseconds.type(), DateFieldMapper.NANOS_PARSER);
         mappers.put(IpFieldMapper.CONTENT_TYPE, IpFieldMapper.PARSER);
         mappers.put(TextFieldMapper.CONTENT_TYPE, TextFieldMapper.PARSER);
+        mappers.put(MatchOnlyTextFieldMapper.CONTENT_TYPE, MatchOnlyTextFieldMapper.PARSER);
         mappers.put(KeywordFieldMapper.CONTENT_TYPE, KeywordFieldMapper.PARSER);
         mappers.put(ObjectMapper.CONTENT_TYPE, new ObjectMapper.TypeParser());
         mappers.put(ObjectMapper.NESTED_CONTENT_TYPE, new ObjectMapper.TypeParser());
diff --git a/server/src/main/java/org/opensearch/indices/IndicesService.java b/server/src/main/java/org/opensearch/indices/IndicesService.java
index 3d1794f8d3197..5c3beaf8509bd 100644
--- a/server/src/main/java/org/opensearch/indices/IndicesService.java
+++ b/server/src/main/java/org/opensearch/indices/IndicesService.java
@@ -301,6 +301,19 @@ public class IndicesService extends AbstractLifecycleComponent
         Property.Final
     );
 
+    /**
+     * If enabled, this setting enforces that indexes will be created with a replication type matching the cluster setting
+     * defined in cluster.indices.replication.strategy by rejecting any request that specifies a replication type that
+     * does not match the cluster setting. If disabled, a user can choose a replication type on a per-index basis using
+     * the index.replication.type setting.
+     */
+    public static final Setting<Boolean> CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING = Setting.boolSetting(
+        "cluster.index.restrict.replication.type",
+        false,
+        Property.NodeScope,
+        Property.Final
+    );
+
     /**
      * The node's settings.
      */
diff --git a/server/src/main/java/org/opensearch/indices/store/ShardAttributes.java b/server/src/main/java/org/opensearch/indices/store/ShardAttributes.java
new file mode 100644
index 0000000000000..4ef4e91f7af8c
--- /dev/null
+++ b/server/src/main/java/org/opensearch/indices/store/ShardAttributes.java
@@ -0,0 +1,59 @@
+/*
+ * 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.indices.store;
+
+import org.opensearch.common.Nullable;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
+import org.opensearch.core.index.shard.ShardId;
+import org.opensearch.gateway.AsyncShardFetch;
+
+import java.io.IOException;
+
+/**
+ * This class contains information about the shard that needs to be sent as part of request in Transport Action implementing
+ * {@link AsyncShardFetch.Lister} to fetch shard information in async manner
+ *
+ * @opensearch.internal
+ */
+public class ShardAttributes implements Writeable {
+    private final ShardId shardId;
+    @Nullable
+    private final String customDataPath;
+
+    public ShardAttributes(ShardId shardId, String customDataPath) {
+        this.shardId = shardId;
+        this.customDataPath = customDataPath;
+    }
+
+    public ShardAttributes(StreamInput in) throws IOException {
+        shardId = new ShardId(in);
+        customDataPath = in.readString();
+    }
+
+    public ShardId getShardId() {
+        return shardId;
+    }
+
+    /**
+     * Returns the custom data path that is used to look up information for this shard.
+     * Returns an empty string if no custom data path is used for this index.
+     * Returns null if custom data path information is not available (due to BWC).
+     */
+    @Nullable
+    public String getCustomDataPath() {
+        return customDataPath;
+    }
+
+    public void writeTo(StreamOutput out) throws IOException {
+        shardId.writeTo(out);
+        out.writeString(customDataPath);
+    }
+}
diff --git a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
index 0afeae253ae14..5a3c1038cd5f0 100644
--- a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
+++ b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
@@ -73,6 +73,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -125,7 +126,14 @@ public TransportNodesListShardStoreMetadata(
     }
 
     @Override
-    public void list(ShardId shardId, String customDataPath, DiscoveryNode[] nodes, ActionListener<NodesStoreFilesMetadata> listener) {
+    public void list(
+        Map<ShardId, ShardAttributes> shardAttributes,
+        DiscoveryNode[] nodes,
+        ActionListener<NodesStoreFilesMetadata> listener
+    ) {
+        assert shardAttributes.size() == 1 : "only one shard should be specified";
+        final ShardId shardId = shardAttributes.keySet().iterator().next();
+        final String customDataPath = shardAttributes.get(shardId).getCustomDataPath();
         execute(new Request(shardId, customDataPath, nodes), listener);
     }
 
diff --git a/server/src/main/java/org/opensearch/search/internal/SearchContext.java b/server/src/main/java/org/opensearch/search/internal/SearchContext.java
index 2dabb825cd227..cc43f4e5d79fb 100644
--- a/server/src/main/java/org/opensearch/search/internal/SearchContext.java
+++ b/server/src/main/java/org/opensearch/search/internal/SearchContext.java
@@ -35,7 +35,6 @@
 import org.apache.lucene.search.CollectorManager;
 import org.apache.lucene.search.FieldDoc;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.util.ArrayUtil;
 import org.opensearch.action.search.SearchShardTask;
 import org.opensearch.action.search.SearchType;
 import org.opensearch.common.Nullable;
@@ -87,6 +86,8 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static org.opensearch.search.aggregations.bucket.BucketUtils.suggestShardSideQueueSize;
+
 /**
  * This class encapsulates the state needed to execute a search. It holds a reference to the
  * shards point in time snapshot (IndexReader / ContextIndexSearcher) and allows passing on
@@ -410,7 +411,7 @@ public boolean shouldUseConcurrentSearch() {
      */
     public LocalBucketCountThresholds asLocalBucketCountThresholds(TermsAggregator.BucketCountThresholds bucketCountThresholds) {
         if (shouldUseConcurrentSearch()) {
-            return new LocalBucketCountThresholds(0, ArrayUtil.MAX_ARRAY_LENGTH - 1);
+            return new LocalBucketCountThresholds(0, suggestShardSideQueueSize(bucketCountThresholds.getShardSize()));
         } else {
             return new LocalBucketCountThresholds(bucketCountThresholds.getShardMinDocCount(), bucketCountThresholds.getShardSize());
         }
diff --git a/server/src/main/java/org/opensearch/search/pipeline/Pipeline.java b/server/src/main/java/org/opensearch/search/pipeline/Pipeline.java
index 8bab961423f91..c88dfb2060393 100644
--- a/server/src/main/java/org/opensearch/search/pipeline/Pipeline.java
+++ b/server/src/main/java/org/opensearch/search/pipeline/Pipeline.java
@@ -119,7 +119,8 @@ protected void afterResponseProcessor(Processor processor, long timeInNanos) {}
 
     protected void onResponseProcessorFailed(Processor processor) {}
 
-    void transformRequest(SearchRequest request, ActionListener<SearchRequest> requestListener) throws SearchPipelineProcessingException {
+    void transformRequest(SearchRequest request, ActionListener<SearchRequest> requestListener, PipelineProcessingContext requestContext)
+        throws SearchPipelineProcessingException {
         if (searchRequestProcessors.isEmpty()) {
             requestListener.onResponse(request);
             return;
@@ -137,7 +138,7 @@ void transformRequest(SearchRequest request, ActionListener<SearchRequest> reque
             return;
         }
 
-        ActionListener<SearchRequest> finalListener = getTerminalSearchRequestActionListener(requestListener);
+        ActionListener<SearchRequest> finalListener = getTerminalSearchRequestActionListener(requestListener, requestContext);
 
         // Chain listeners back-to-front
         ActionListener<SearchRequest> currentListener = finalListener;
@@ -147,7 +148,7 @@ void transformRequest(SearchRequest request, ActionListener<SearchRequest> reque
             currentListener = ActionListener.wrap(r -> {
                 long start = relativeTimeSupplier.getAsLong();
                 beforeRequestProcessor(processor);
-                processor.processRequestAsync(r, ActionListener.wrap(rr -> {
+                processor.processRequestAsync(r, requestContext, ActionListener.wrap(rr -> {
                     long took = TimeUnit.NANOSECONDS.toMillis(relativeTimeSupplier.getAsLong() - start);
                     afterRequestProcessor(processor, took);
                     nextListener.onResponse(rr);
@@ -176,13 +177,16 @@ void transformRequest(SearchRequest request, ActionListener<SearchRequest> reque
         currentListener.onResponse(request);
     }
 
-    private ActionListener<SearchRequest> getTerminalSearchRequestActionListener(ActionListener<SearchRequest> requestListener) {
+    private ActionListener<SearchRequest> getTerminalSearchRequestActionListener(
+        ActionListener<SearchRequest> requestListener,
+        PipelineProcessingContext requestContext
+    ) {
         final long pipelineStart = relativeTimeSupplier.getAsLong();
 
         return ActionListener.wrap(r -> {
             long took = TimeUnit.NANOSECONDS.toMillis(relativeTimeSupplier.getAsLong() - pipelineStart);
             afterTransformRequest(took);
-            requestListener.onResponse(new PipelinedRequest(this, r));
+            requestListener.onResponse(new PipelinedRequest(this, r, requestContext));
         }, e -> {
             long took = TimeUnit.NANOSECONDS.toMillis(relativeTimeSupplier.getAsLong() - pipelineStart);
             afterTransformRequest(took);
@@ -191,7 +195,11 @@ private ActionListener<SearchRequest> getTerminalSearchRequestActionListener(Act
         });
     }
 
-    ActionListener<SearchResponse> transformResponseListener(SearchRequest request, ActionListener<SearchResponse> responseListener) {
+    ActionListener<SearchResponse> transformResponseListener(
+        SearchRequest request,
+        ActionListener<SearchResponse> responseListener,
+        PipelineProcessingContext requestContext
+    ) {
         if (searchResponseProcessors.isEmpty()) {
             // No response transformation necessary
             return responseListener;
@@ -219,7 +227,7 @@ ActionListener<SearchResponse> transformResponseListener(SearchRequest request,
             responseListener = ActionListener.wrap(r -> {
                 beforeResponseProcessor(processor);
                 final long start = relativeTimeSupplier.getAsLong();
-                processor.processResponseAsync(request, r, ActionListener.wrap(rr -> {
+                processor.processResponseAsync(request, r, requestContext, ActionListener.wrap(rr -> {
                     long took = TimeUnit.NANOSECONDS.toMillis(relativeTimeSupplier.getAsLong() - start);
                     afterResponseProcessor(processor, took);
                     currentFinalListener.onResponse(rr);
@@ -257,14 +265,15 @@ <Result extends SearchPhaseResult> void runSearchPhaseResultsTransformer(
         SearchPhaseResults<Result> searchPhaseResult,
         SearchPhaseContext context,
         String currentPhase,
-        String nextPhase
+        String nextPhase,
+        PipelineProcessingContext requestContext
     ) throws SearchPipelineProcessingException {
         try {
             for (SearchPhaseResultsProcessor searchPhaseResultsProcessor : searchPhaseResultsProcessors) {
                 if (currentPhase.equals(searchPhaseResultsProcessor.getBeforePhase().getName())
                     && nextPhase.equals(searchPhaseResultsProcessor.getAfterPhase().getName())) {
                     try {
-                        searchPhaseResultsProcessor.process(searchPhaseResult, context);
+                        searchPhaseResultsProcessor.process(searchPhaseResult, context, requestContext);
                     } catch (Exception e) {
                         if (searchPhaseResultsProcessor.isIgnoreFailure()) {
                             logger.warn(
diff --git a/server/src/main/java/org/opensearch/search/pipeline/PipelineProcessingContext.java b/server/src/main/java/org/opensearch/search/pipeline/PipelineProcessingContext.java
new file mode 100644
index 0000000000000..a1f2b8b99d958
--- /dev/null
+++ b/server/src/main/java/org/opensearch/search/pipeline/PipelineProcessingContext.java
@@ -0,0 +1,38 @@
+/*
+ * 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.search.pipeline;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A holder for state that is passed through each processor in the pipeline.
+ */
+public class PipelineProcessingContext {
+    private final Map<String, Object> attributes = new HashMap<>();
+
+    /**
+     * Set a generic attribute in the state for this request. Overwrites any existing value.
+     *
+     * @param name the name of the attribute to set
+     * @param value the value to set on the attributen
+     */
+    public void setAttribute(String name, Object value) {
+        attributes.put(name, value);
+    }
+
+    /**
+     * Retrieves a generic attribute value from the state for this request.
+     * @param name the name of the attribute
+     * @return the value of the attribute if previously set (and null otherwise)
+     */
+    public Object getAttribute(String name) {
+        return attributes.get(name);
+    }
+}
diff --git a/server/src/main/java/org/opensearch/search/pipeline/PipelinedRequest.java b/server/src/main/java/org/opensearch/search/pipeline/PipelinedRequest.java
index 77dfc6bcd4fc5..d550fbb768133 100644
--- a/server/src/main/java/org/opensearch/search/pipeline/PipelinedRequest.java
+++ b/server/src/main/java/org/opensearch/search/pipeline/PipelinedRequest.java
@@ -22,18 +22,20 @@
  */
 public final class PipelinedRequest extends SearchRequest {
     private final Pipeline pipeline;
+    private final PipelineProcessingContext requestContext;
 
-    PipelinedRequest(Pipeline pipeline, SearchRequest transformedRequest) {
+    PipelinedRequest(Pipeline pipeline, SearchRequest transformedRequest, PipelineProcessingContext requestContext) {
         super(transformedRequest);
         this.pipeline = pipeline;
+        this.requestContext = requestContext;
     }
 
     public void transformRequest(ActionListener<SearchRequest> requestListener) {
-        pipeline.transformRequest(this, requestListener);
+        pipeline.transformRequest(this, requestListener, requestContext);
     }
 
     public ActionListener<SearchResponse> transformResponseListener(ActionListener<SearchResponse> responseListener) {
-        return pipeline.transformResponseListener(this, responseListener);
+        return pipeline.transformResponseListener(this, responseListener, requestContext);
     }
 
     public <Result extends SearchPhaseResult> void transformSearchPhaseResults(
@@ -42,7 +44,7 @@ public <Result extends SearchPhaseResult> void transformSearchPhaseResults(
         final String currentPhase,
         final String nextPhase
     ) {
-        pipeline.runSearchPhaseResultsTransformer(searchPhaseResult, searchPhaseContext, currentPhase, nextPhase);
+        pipeline.runSearchPhaseResultsTransformer(searchPhaseResult, searchPhaseContext, currentPhase, nextPhase, requestContext);
     }
 
     // Visible for testing
diff --git a/server/src/main/java/org/opensearch/search/pipeline/Processor.java b/server/src/main/java/org/opensearch/search/pipeline/Processor.java
index 0120d68ceb5aa..a06383fbe9cef 100644
--- a/server/src/main/java/org/opensearch/search/pipeline/Processor.java
+++ b/server/src/main/java/org/opensearch/search/pipeline/Processor.java
@@ -21,13 +21,6 @@
  * @opensearch.internal
  */
 public interface Processor {
-    /**
-     * Processor configuration key to let the factory know the context for pipeline creation.
-     * <p>
-     * See {@link PipelineSource}.
-     */
-    String PIPELINE_SOURCE = "pipeline_source";
-
     /**
      * Gets the type of processor
      */
diff --git a/server/src/main/java/org/opensearch/search/pipeline/SearchPhaseResultsProcessor.java b/server/src/main/java/org/opensearch/search/pipeline/SearchPhaseResultsProcessor.java
index 772dc8758bace..a64266cfb2a2b 100644
--- a/server/src/main/java/org/opensearch/search/pipeline/SearchPhaseResultsProcessor.java
+++ b/server/src/main/java/org/opensearch/search/pipeline/SearchPhaseResultsProcessor.java
@@ -32,6 +32,22 @@ <Result extends SearchPhaseResult> void process(
         final SearchPhaseContext searchPhaseContext
     );
 
+    /**
+     * Processes the {@link SearchPhaseResults} obtained from a SearchPhase which will be returned to next
+     * SearchPhase. Receives the {@link PipelineProcessingContext} passed to other processors.
+     * @param searchPhaseResult {@link SearchPhaseResults}
+     * @param searchPhaseContext {@link SearchContext}
+     * @param requestContext {@link PipelineProcessingContext}
+     * @param <Result> {@link SearchPhaseResult}
+     */
+    default <Result extends SearchPhaseResult> void process(
+        final SearchPhaseResults<Result> searchPhaseResult,
+        final SearchPhaseContext searchPhaseContext,
+        final PipelineProcessingContext requestContext
+    ) {
+        process(searchPhaseResult, searchPhaseContext);
+    }
+
     /**
      * The phase which should have run before, this processor can start executing.
      * @return {@link SearchPhaseName}
diff --git a/server/src/main/java/org/opensearch/search/pipeline/SearchPipelineService.java b/server/src/main/java/org/opensearch/search/pipeline/SearchPipelineService.java
index 580fe1b7c4216..2175b5d135394 100644
--- a/server/src/main/java/org/opensearch/search/pipeline/SearchPipelineService.java
+++ b/server/src/main/java/org/opensearch/search/pipeline/SearchPipelineService.java
@@ -408,7 +408,8 @@ public PipelinedRequest resolvePipeline(SearchRequest searchRequest) {
                 pipeline = pipelineHolder.pipeline;
             }
         }
-        return new PipelinedRequest(pipeline, searchRequest);
+        PipelineProcessingContext requestContext = new PipelineProcessingContext();
+        return new PipelinedRequest(pipeline, searchRequest, requestContext);
     }
 
     Map<String, Processor.Factory<SearchRequestProcessor>> getRequestProcessorFactories() {
diff --git a/server/src/main/java/org/opensearch/search/pipeline/SearchRequestProcessor.java b/server/src/main/java/org/opensearch/search/pipeline/SearchRequestProcessor.java
index 427c9e4ab694c..30adc9b0afbe8 100644
--- a/server/src/main/java/org/opensearch/search/pipeline/SearchRequestProcessor.java
+++ b/server/src/main/java/org/opensearch/search/pipeline/SearchRequestProcessor.java
@@ -15,18 +15,27 @@
  * Interface for a search pipeline processor that modifies a search request.
  */
 public interface SearchRequestProcessor extends Processor {
-
     /**
-     * Transform a {@link SearchRequest}. Executed on the coordinator node before any {@link org.opensearch.action.search.SearchPhase}
-     * executes.
-     * <p>
+     * Process a SearchRequest without receiving request-scoped state.
      * Implement this method if the processor makes no asynchronous calls.
-     * @param request the executed {@link SearchRequest}
-     * @return a new {@link SearchRequest} (or the input {@link SearchRequest} if no changes)
-     * @throws Exception if an error occurs during processing
+     * @param request the search request (which may have been modified by an earlier processor)
+     * @return the modified search request
+     * @throws Exception implementation-specific processing exception
      */
     SearchRequest processRequest(SearchRequest request) throws Exception;
 
+    /**
+     * Process a SearchRequest, with request-scoped state shared across processors in the pipeline
+     * Implement this method if the processor makes no asynchronous calls.
+     * @param request the search request (which may have been modified by an earlier processor)
+     * @param requestContext request-scoped state shared across processors in the pipeline
+     * @return the modified search request
+     * @throws Exception implementation-specific processing exception
+     */
+    default SearchRequest processRequest(SearchRequest request, PipelineProcessingContext requestContext) throws Exception {
+        return processRequest(request);
+    }
+
     /**
      * Transform a {@link SearchRequest}. Executed on the coordinator node before any {@link org.opensearch.action.search.SearchPhase}
      * executes.
@@ -35,9 +44,13 @@ public interface SearchRequestProcessor extends Processor {
      * @param request the executed {@link SearchRequest}
      * @param requestListener callback to be invoked on successful processing or on failure
      */
-    default void processRequestAsync(SearchRequest request, ActionListener<SearchRequest> requestListener) {
+    default void processRequestAsync(
+        SearchRequest request,
+        PipelineProcessingContext requestContext,
+        ActionListener<SearchRequest> requestListener
+    ) {
         try {
-            requestListener.onResponse(processRequest(request));
+            requestListener.onResponse(processRequest(request, requestContext));
         } catch (Exception e) {
             requestListener.onFailure(e);
         }
diff --git a/server/src/main/java/org/opensearch/search/pipeline/SearchResponseProcessor.java b/server/src/main/java/org/opensearch/search/pipeline/SearchResponseProcessor.java
index 21136ce208fee..98591ab9d0def 100644
--- a/server/src/main/java/org/opensearch/search/pipeline/SearchResponseProcessor.java
+++ b/server/src/main/java/org/opensearch/search/pipeline/SearchResponseProcessor.java
@@ -21,24 +21,47 @@ public interface SearchResponseProcessor extends Processor {
      * Transform a {@link SearchResponse}, possibly based on the executed {@link SearchRequest}.
      * <p>
      * Implement this method if the processor makes no asynchronous calls.
-     * @param request the executed {@link SearchRequest}
+     *
+     * @param request  the executed {@link SearchRequest}
      * @param response the current {@link SearchResponse}, possibly modified by earlier processors
      * @return a modified {@link SearchResponse} (or the input {@link SearchResponse} if no changes)
      * @throws Exception if an error occurs during processing
      */
     SearchResponse processResponse(SearchRequest request, SearchResponse response) throws Exception;
 
+    /**
+     * Process a SearchResponse, with request-scoped state shared across processors in the pipeline
+     * <p>
+     * Implement this method if the processor makes no asynchronous calls.
+     *
+     * @param request        the (maybe transformed) search request
+     * @param response       the search response (which may have been modified by an earlier processor)
+     * @param requestContext request-scoped state shared across processors in the pipeline
+     * @return the modified search response
+     * @throws Exception implementation-specific processing exception
+     */
+    default SearchResponse processResponse(SearchRequest request, SearchResponse response, PipelineProcessingContext requestContext)
+        throws Exception {
+        return processResponse(request, response);
+    }
+
     /**
      * Transform a {@link SearchResponse}, possibly based on the executed {@link SearchRequest}.
      * <p>
      * Expert method: Implement this if the processor needs to make asynchronous calls. Otherwise, implement processResponse.
-     * @param request the executed {@link SearchRequest}
-     * @param response the current {@link SearchResponse}, possibly modified by earlier processors
+     *
+     * @param request          the executed {@link SearchRequest}
+     * @param response         the current {@link SearchResponse}, possibly modified by earlier processors
      * @param responseListener callback to be invoked on successful processing or on failure
      */
-    default void processResponseAsync(SearchRequest request, SearchResponse response, ActionListener<SearchResponse> responseListener) {
+    default void processResponseAsync(
+        SearchRequest request,
+        SearchResponse response,
+        PipelineProcessingContext requestContext,
+        ActionListener<SearchResponse> responseListener
+    ) {
         try {
-            responseListener.onResponse(processResponse(request, response));
+            responseListener.onResponse(processResponse(request, response, requestContext));
         } catch (Exception e) {
             responseListener.onFailure(e);
         }
diff --git a/server/src/main/java/org/opensearch/search/pipeline/StatefulSearchRequestProcessor.java b/server/src/main/java/org/opensearch/search/pipeline/StatefulSearchRequestProcessor.java
new file mode 100644
index 0000000000000..67e1c1147cb87
--- /dev/null
+++ b/server/src/main/java/org/opensearch/search/pipeline/StatefulSearchRequestProcessor.java
@@ -0,0 +1,25 @@
+/*
+ * 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.search.pipeline;
+
+import org.opensearch.action.search.SearchRequest;
+
+/**
+ * A specialization of {@link SearchRequestProcessor} that makes use of the request-scoped processor state.
+ * Implementors must implement the processRequest method that accepts request-scoped processor state.
+ */
+public interface StatefulSearchRequestProcessor extends SearchRequestProcessor {
+    @Override
+    default SearchRequest processRequest(SearchRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    SearchRequest processRequest(SearchRequest request, PipelineProcessingContext requestContext) throws Exception;
+}
diff --git a/server/src/main/java/org/opensearch/search/pipeline/StatefulSearchResponseProcessor.java b/server/src/main/java/org/opensearch/search/pipeline/StatefulSearchResponseProcessor.java
new file mode 100644
index 0000000000000..f0842d24e1b56
--- /dev/null
+++ b/server/src/main/java/org/opensearch/search/pipeline/StatefulSearchResponseProcessor.java
@@ -0,0 +1,27 @@
+/*
+ * 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.search.pipeline;
+
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+
+/**
+ * A specialization of {@link SearchResponseProcessor} that makes use of the request-scoped processor state.
+ * Implementors must implement the processResponse method that accepts request-scoped processor state.
+ */
+public interface StatefulSearchResponseProcessor extends SearchResponseProcessor {
+    @Override
+    default SearchResponse processResponse(SearchRequest request, SearchResponse response) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    SearchResponse processResponse(SearchRequest request, SearchResponse response, PipelineProcessingContext requestContext)
+        throws Exception;
+}
diff --git a/server/src/main/java/org/opensearch/threadpool/ThreadPool.java b/server/src/main/java/org/opensearch/threadpool/ThreadPool.java
index c825ecc8abe9f..12052598d3671 100644
--- a/server/src/main/java/org/opensearch/threadpool/ThreadPool.java
+++ b/server/src/main/java/org/opensearch/threadpool/ThreadPool.java
@@ -231,6 +231,7 @@ public ThreadPool(
 
         final Map<String, ExecutorBuilder> builders = new HashMap<>();
         final int allocatedProcessors = OpenSearchExecutors.allocatedProcessors(settings);
+        final int halfProc = halfAllocatedProcessors(allocatedProcessors);
         final int halfProcMaxAt5 = halfAllocatedProcessorsMaxFive(allocatedProcessors);
         final int halfProcMaxAt10 = halfAllocatedProcessorsMaxTen(allocatedProcessors);
         final int genericThreadPoolMax = boundedBy(4 * allocatedProcessors, 128, 512);
@@ -264,13 +265,13 @@ public ThreadPool(
         builders.put(Names.SYSTEM_WRITE, new FixedExecutorBuilder(settings, Names.SYSTEM_WRITE, halfProcMaxAt5, 1000, false));
         builders.put(
             Names.TRANSLOG_TRANSFER,
-            new ScalingExecutorBuilder(Names.TRANSLOG_TRANSFER, 1, halfProcMaxAt10, TimeValue.timeValueMinutes(5))
+            new ScalingExecutorBuilder(Names.TRANSLOG_TRANSFER, 1, halfProc, TimeValue.timeValueMinutes(5))
         );
         builders.put(Names.TRANSLOG_SYNC, new FixedExecutorBuilder(settings, Names.TRANSLOG_SYNC, allocatedProcessors * 4, 10000));
-        builders.put(Names.REMOTE_PURGE, new ScalingExecutorBuilder(Names.REMOTE_PURGE, 1, halfProcMaxAt5, TimeValue.timeValueMinutes(5)));
+        builders.put(Names.REMOTE_PURGE, new ScalingExecutorBuilder(Names.REMOTE_PURGE, 1, halfProc, TimeValue.timeValueMinutes(5)));
         builders.put(
             Names.REMOTE_REFRESH_RETRY,
-            new ScalingExecutorBuilder(Names.REMOTE_REFRESH_RETRY, 1, halfProcMaxAt10, TimeValue.timeValueMinutes(5))
+            new ScalingExecutorBuilder(Names.REMOTE_REFRESH_RETRY, 1, halfProc, TimeValue.timeValueMinutes(5))
         );
         builders.put(
             Names.REMOTE_RECOVERY,
@@ -555,6 +556,10 @@ static int boundedBy(int value, int min, int max) {
         return Math.min(max, Math.max(min, value));
     }
 
+    static int halfAllocatedProcessors(int allocatedProcessors) {
+        return (allocatedProcessors + 1) / 2;
+    }
+
     static int halfAllocatedProcessorsMaxFive(final int allocatedProcessors) {
         return boundedBy((allocatedProcessors + 1) / 2, 1, 5);
     }
diff --git a/server/src/test/java/org/opensearch/action/search/TransportDeletePitActionTests.java b/server/src/test/java/org/opensearch/action/search/TransportDeletePitActionTests.java
index 8d3cdc070c695..a1e3a2b03caf7 100644
--- a/server/src/test/java/org/opensearch/action/search/TransportDeletePitActionTests.java
+++ b/server/src/test/java/org/opensearch/action/search/TransportDeletePitActionTests.java
@@ -21,6 +21,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.core.tasks.TaskId;
 import org.opensearch.index.query.IdsQueryBuilder;
 import org.opensearch.index.query.MatchAllQueryBuilder;
@@ -33,6 +34,7 @@
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.RemoteClusterConnectionTests;
 import org.opensearch.transport.Transport;
+import org.opensearch.transport.TransportService;
 import org.junit.Before;
 
 import java.util.ArrayList;
@@ -262,6 +264,46 @@ public void getAllPits(ActionListener<GetAllPitNodesResponse> getAllPitsListener
         }
     }
 
+    public void testDeleteAllPITSuccessWhenNoPITsExist() throws InterruptedException, ExecutionException {
+        ActionFilters actionFilters = mock(ActionFilters.class);
+        when(actionFilters.filters()).thenReturn(new ActionFilter[0]);
+        List<DiscoveryNode> knownNodes = new CopyOnWriteArrayList<>();
+        try (MockTransportService cluster1Transport = startTransport("cluster_1_node", knownNodes, Version.CURRENT)) {
+            knownNodes.add(cluster1Transport.getLocalDiscoNode());
+            TransportService mockTransportService = mock(TransportService.class);
+            PitService pitService = new PitService(clusterServiceMock, mock(SearchTransportService.class), mockTransportService, client) {
+                @Override
+                public void getAllPits(ActionListener<GetAllPitNodesResponse> getAllPitsListener) {
+                    List<ListPitInfo> list = new ArrayList<>();
+                    GetAllPitNodeResponse getAllPitNodeResponse = new GetAllPitNodeResponse(cluster1Transport.getLocalDiscoNode(), list);
+                    List<GetAllPitNodeResponse> nodeList = new ArrayList();
+                    nodeList.add(getAllPitNodeResponse);
+                    getAllPitsListener.onResponse(new GetAllPitNodesResponse(new ClusterName("cn"), nodeList, new ArrayList()));
+                }
+            };
+            TransportDeletePitAction action = new TransportDeletePitAction(
+                mockTransportService,
+                actionFilters,
+                namedWriteableRegistry,
+                pitService
+            );
+            DeletePitRequest deletePITRequest = new DeletePitRequest("_all");
+            ActionListener<DeletePitResponse> listener = new ActionListener<DeletePitResponse>() {
+                @Override
+                public void onResponse(DeletePitResponse deletePitResponse) {
+                    assertEquals(RestStatus.OK, deletePitResponse.status());
+                    assertEquals(0, deletePitResponse.getDeletePitResults().size());
+                }
+
+                @Override
+                public void onFailure(Exception e) {
+                    fail("Should not receive Exception");
+                }
+            };
+            action.execute(task, deletePITRequest, listener);
+        }
+    }
+
     public void testDeletePitWhenNodeIsDown() throws InterruptedException, ExecutionException {
         List<DiscoveryNode> deleteNodesInvoked = new CopyOnWriteArrayList<>();
         ActionFilters actionFilters = mock(ActionFilters.class);
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
index e40826915c848..cea151748bfb6 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
@@ -71,6 +71,7 @@
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.index.translog.Translog;
+import org.opensearch.indices.IndexCreationException;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.indices.InvalidAliasNameException;
 import org.opensearch.indices.InvalidIndexNameException;
@@ -117,6 +118,7 @@
 import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING;
 import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_NUMBER_OF_SHARDS_SETTING;
 import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_READ_ONLY_BLOCK;
+import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_REPLICATION_TYPE_SETTING;
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS;
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_READ_ONLY;
@@ -136,6 +138,7 @@
 import static org.opensearch.index.IndexSettings.INDEX_SOFT_DELETES_SETTING;
 import static org.opensearch.index.IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING;
 import static org.opensearch.indices.IndicesService.CLUSTER_DEFAULT_INDEX_REFRESH_INTERVAL_SETTING;
+import static org.opensearch.indices.IndicesService.CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING;
 import static org.opensearch.indices.IndicesService.CLUSTER_MINIMUM_INDEX_REFRESH_INTERVAL_SETTING;
 import static org.opensearch.indices.IndicesService.CLUSTER_REMOTE_INDEX_RESTRICT_ASYNC_DURABILITY_SETTING;
 import static org.opensearch.indices.IndicesService.CLUSTER_REPLICATION_TYPE_SETTING;
@@ -165,6 +168,9 @@ public class MetadataCreateIndexServiceTests extends OpenSearchTestCase {
     private static final String translogRepositoryNameAttributeKey = NODE_ATTRIBUTES.getKey()
         + REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY;
 
+    final String REPLICATION_MISMATCH_VALIDATION_ERROR =
+        "Validation Failed: 1: index setting [index.replication.type] is not allowed to be set as [cluster.index.restrict.replication.type=true];";
+
     @Before
     public void setup() throws Exception {
         super.setUp();
@@ -1217,6 +1223,126 @@ public void testvalidateIndexSettings() {
         threadPool.shutdown();
     }
 
+    public void testIndexTemplateReplicationType() {
+        Settings templateSettings = Settings.builder().put(INDEX_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.SEGMENT).build();
+
+        request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test");
+        final Settings.Builder requestSettings = Settings.builder();
+        request.settings(requestSettings.build());
+        Settings indexSettings = aggregateIndexSettings(
+            ClusterState.EMPTY_STATE,
+            request,
+            templateSettings,
+            null,
+            Settings.EMPTY,
+            IndexScopedSettings.DEFAULT_SCOPED_SETTINGS,
+            randomShardLimitService(),
+            Collections.emptySet(),
+            clusterSettings
+        );
+        assertNotEquals(ReplicationType.SEGMENT, clusterSettings.get(CLUSTER_REPLICATION_TYPE_SETTING));
+        assertEquals(ReplicationType.SEGMENT.toString(), indexSettings.get(INDEX_REPLICATION_TYPE_SETTING.getKey()));
+    }
+
+    public void testClusterForceReplicationTypeInAggregateSettings() {
+        Settings settings = Settings.builder()
+            .put(CLUSTER_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.SEGMENT)
+            .put(CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING.getKey(), true)
+            .build();
+        ClusterSettings clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        Settings nonMatchingReplicationIndexSettings = Settings.builder()
+            .put(INDEX_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.DOCUMENT)
+            .build();
+        request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test");
+        request.settings(nonMatchingReplicationIndexSettings);
+        IndexCreationException exception = expectThrows(
+            IndexCreationException.class,
+            () -> aggregateIndexSettings(
+                ClusterState.EMPTY_STATE,
+                request,
+                Settings.EMPTY,
+                null,
+                Settings.EMPTY,
+                IndexScopedSettings.DEFAULT_SCOPED_SETTINGS,
+                randomShardLimitService(),
+                Collections.emptySet(),
+                clusterSettings
+            )
+        );
+        assertEquals(REPLICATION_MISMATCH_VALIDATION_ERROR, exception.getCause().getMessage());
+
+        Settings matchingReplicationIndexSettings = Settings.builder()
+            .put(INDEX_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.SEGMENT)
+            .build();
+        request.settings(matchingReplicationIndexSettings);
+        Settings aggregateIndexSettings = aggregateIndexSettings(
+            ClusterState.EMPTY_STATE,
+            request,
+            Settings.EMPTY,
+            null,
+            Settings.EMPTY,
+            IndexScopedSettings.DEFAULT_SCOPED_SETTINGS,
+            randomShardLimitService(),
+            Collections.emptySet(),
+            clusterSettings
+        );
+        assertEquals(ReplicationType.SEGMENT.toString(), aggregateIndexSettings.get(INDEX_REPLICATION_TYPE_SETTING.getKey()));
+    }
+
+    public void testClusterForceReplicationTypeInValidateIndexSettings() {
+        ClusterService clusterService = mock(ClusterService.class);
+        Metadata metadata = Metadata.builder()
+            .transientSettings(Settings.builder().put(Metadata.DEFAULT_REPLICA_COUNT_SETTING.getKey(), 1).build())
+            .build();
+        ClusterState clusterState = ClusterState.builder(org.opensearch.cluster.ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY))
+            .metadata(metadata)
+            .build();
+        ThreadPool threadPool = new TestThreadPool(getTestName());
+        // Enforce cluster level replication type setting
+        final Settings forceClusterSettingEnabled = Settings.builder()
+            .put(CLUSTER_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.SEGMENT)
+            .put(CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING.getKey(), true)
+            .build();
+        ClusterSettings clusterSettings = new ClusterSettings(forceClusterSettingEnabled, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        when(clusterService.getSettings()).thenReturn(forceClusterSettingEnabled);
+        when(clusterService.getClusterSettings()).thenReturn(clusterSettings);
+        when(clusterService.state()).thenReturn(clusterState);
+
+        final MetadataCreateIndexService checkerService = new MetadataCreateIndexService(
+            forceClusterSettingEnabled,
+            clusterService,
+            null,
+            null,
+            null,
+            createTestShardLimitService(randomIntBetween(1, 1000), false, clusterService),
+            new Environment(Settings.builder().put("path.home", "dummy").build(), null),
+            IndexScopedSettings.DEFAULT_SCOPED_SETTINGS,
+            threadPool,
+            null,
+            new SystemIndices(Collections.emptyMap()),
+            true,
+            new AwarenessReplicaBalance(forceClusterSettingEnabled, clusterService.getClusterSettings())
+        );
+        // Use DOCUMENT replication type setting for index creation
+        final Settings indexSettings = Settings.builder().put(INDEX_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.DOCUMENT).build();
+
+        IndexCreationException exception = expectThrows(
+            IndexCreationException.class,
+            () -> checkerService.validateIndexSettings("test", indexSettings, false)
+        );
+        assertEquals(REPLICATION_MISMATCH_VALIDATION_ERROR, exception.getCause().getMessage());
+
+        // Cluster level replication type setting not enforced
+        final Settings forceClusterSettingDisabled = Settings.builder()
+            .put(CLUSTER_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.SEGMENT)
+            .put(CLUSTER_INDEX_RESTRICT_REPLICATION_TYPE_SETTING.getKey(), false)
+            .build();
+        clusterSettings = new ClusterSettings(forceClusterSettingDisabled, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
+        when(clusterService.getClusterSettings()).thenReturn(clusterSettings);
+        checkerService.validateIndexSettings("test", indexSettings, false);
+        threadPool.shutdown();
+    }
+
     public void testRemoteStoreNoUserOverrideExceptReplicationTypeSegmentIndexSettings() {
         Settings settings = Settings.builder()
             .put(CLUSTER_REPLICATION_TYPE_SETTING.getKey(), ReplicationType.DOCUMENT)
diff --git a/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/TargetPoolAllocationDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/TargetPoolAllocationDeciderTests.java
index 8f2db5db969d2..052c7877404a8 100644
--- a/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/TargetPoolAllocationDeciderTests.java
+++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/TargetPoolAllocationDeciderTests.java
@@ -200,4 +200,88 @@ public void testTargetPoolDedicatedSearchNodeAllocationDecisions() {
         assertEquals(Decision.YES.type(), deciders.shouldAutoExpandToNode(localIdx, localOnlyNode.node(), globalAllocation).type());
         assertEquals(Decision.YES.type(), deciders.shouldAutoExpandToNode(remoteIdx, remoteCapableNode.node(), globalAllocation).type());
     }
+
+    public void testDebugMessage() {
+        ClusterState clusterState = createInitialCluster(3, 3, true, 2, 2);
+        AllocationService service = this.createRemoteCapableAllocationService();
+        clusterState = allocateShardsAndBalance(clusterState, service);
+
+        // Add an unassigned primary shard for force allocation checks
+        Metadata metadata = Metadata.builder(clusterState.metadata())
+            .put(IndexMetadata.builder("test_local_unassigned").settings(settings(Version.CURRENT)).numberOfShards(1).numberOfReplicas(1))
+            .build();
+        RoutingTable routingTable = RoutingTable.builder(clusterState.routingTable())
+            .addAsNew(metadata.index("test_local_unassigned"))
+            .build();
+        clusterState = ClusterState.builder(clusterState).metadata(metadata).routingTable(routingTable).build();
+
+        // Add remote index unassigned primary
+        clusterState = createRemoteIndex(clusterState, "test_remote_unassigned");
+
+        RoutingNodes defaultRoutingNodes = clusterState.getRoutingNodes();
+        RoutingAllocation globalAllocation = getRoutingAllocation(clusterState, defaultRoutingNodes);
+        globalAllocation.setDebugMode(RoutingAllocation.DebugMode.ON);
+
+        ShardRouting localShard = clusterState.routingTable()
+            .allShards(getIndexName(0, false))
+            .stream()
+            .filter(ShardRouting::primary)
+            .collect(Collectors.toList())
+            .get(0);
+        ShardRouting remoteShard = clusterState.routingTable()
+            .allShards(getIndexName(0, true))
+            .stream()
+            .filter(ShardRouting::primary)
+            .collect(Collectors.toList())
+            .get(0);
+        ShardRouting unassignedLocalShard = clusterState.routingTable()
+            .allShards("test_local_unassigned")
+            .stream()
+            .filter(ShardRouting::primary)
+            .collect(Collectors.toList())
+            .get(0);
+        ShardRouting unassignedRemoteShard = clusterState.routingTable()
+            .allShards("test_remote_unassigned")
+            .stream()
+            .filter(ShardRouting::primary)
+            .collect(Collectors.toList())
+            .get(0);
+        IndexMetadata localIdx = globalAllocation.metadata().getIndexSafe(localShard.index());
+        IndexMetadata remoteIdx = globalAllocation.metadata().getIndexSafe(remoteShard.index());
+        String localNodeId = LOCAL_NODE_PREFIX;
+        for (RoutingNode routingNode : globalAllocation.routingNodes()) {
+            if (routingNode.nodeId().startsWith(LOCAL_NODE_PREFIX)) {
+                localNodeId = routingNode.nodeId();
+                break;
+            }
+        }
+        String remoteNodeId = remoteShard.currentNodeId();
+        RoutingNode localOnlyNode = defaultRoutingNodes.node(localNodeId);
+        RoutingNode remoteCapableNode = defaultRoutingNodes.node(remoteNodeId);
+
+        TargetPoolAllocationDecider targetPoolAllocationDecider = new TargetPoolAllocationDecider();
+        Decision decision = targetPoolAllocationDecider.canAllocate(localShard, remoteCapableNode, globalAllocation);
+        assertEquals(
+            "Routing pools are incompatible. Shard pool: [LOCAL_ONLY], node pool: [REMOTE_CAPABLE] without [data] role",
+            decision.getExplanation()
+        );
+
+        decision = targetPoolAllocationDecider.canAllocate(remoteShard, localOnlyNode, globalAllocation);
+        assertEquals("Routing pools are incompatible. Shard pool: [REMOTE_CAPABLE], node pool: [LOCAL_ONLY]", decision.getExplanation());
+
+        decision = targetPoolAllocationDecider.canAllocate(remoteShard, remoteCapableNode, globalAllocation);
+        assertEquals("Routing pools are compatible. Shard pool: [REMOTE_CAPABLE], node pool: [REMOTE_CAPABLE]", decision.getExplanation());
+
+        decision = targetPoolAllocationDecider.canAllocate(localIdx, remoteCapableNode, globalAllocation);
+        assertEquals(
+            "Routing pools are incompatible. Index pool: [LOCAL_ONLY], node pool: [REMOTE_CAPABLE] without [data] role",
+            decision.getExplanation()
+        );
+
+        decision = targetPoolAllocationDecider.canAllocate(remoteIdx, localOnlyNode, globalAllocation);
+        assertEquals("Routing pools are incompatible. Index pool: [REMOTE_CAPABLE], node pool: [LOCAL_ONLY]", decision.getExplanation());
+
+        decision = targetPoolAllocationDecider.canAllocate(remoteIdx, remoteCapableNode, globalAllocation);
+        assertEquals("Routing pools are compatible. Index pool: [REMOTE_CAPABLE], node pool: [REMOTE_CAPABLE]", decision.getExplanation());
+    }
 }
diff --git a/server/src/test/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainerTests.java b/server/src/test/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainerTests.java
index a33e5f453d1e1..074f659850c7b 100644
--- a/server/src/test/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainerTests.java
+++ b/server/src/test/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainerTests.java
@@ -8,21 +8,36 @@
 
 package org.opensearch.common.blobstore.transfer;
 
+import org.apache.lucene.store.AlreadyClosedException;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.RateLimiter;
 import org.opensearch.common.StreamContext;
 import org.opensearch.common.blobstore.stream.write.WriteContext;
 import org.opensearch.common.blobstore.stream.write.WritePriority;
 import org.opensearch.common.blobstore.transfer.stream.OffsetRangeFileInputStream;
+import org.opensearch.common.blobstore.transfer.stream.OffsetRangeIndexInputStream;
 import org.opensearch.common.blobstore.transfer.stream.OffsetRangeInputStream;
+import org.opensearch.common.blobstore.transfer.stream.RateLimitingOffsetRangeInputStream;
 import org.opensearch.common.blobstore.transfer.stream.ResettableCheckedInputStream;
 import org.opensearch.common.io.InputStreamContainer;
 import org.opensearch.test.OpenSearchTestCase;
 import org.junit.Before;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
 import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
 
 public class RemoteTransferContainerTests extends OpenSearchTestCase {
 
@@ -92,25 +107,37 @@ private void testSupplyStreamContext(
         int partCount = streamContext.getNumberOfParts();
         assertEquals(expectedPartCount, partCount);
         Thread[] threads = new Thread[partCount];
+        InputStream[] streams = new InputStream[partCount];
         long totalContentLength = remoteTransferContainer.getContentLength();
         assert partSize * (partCount - 1) + lastPartSize == totalContentLength
             : "part sizes and last part size don't add up to total content length";
         logger.info("partSize: {}, lastPartSize: {}, partCount: {}", partSize, lastPartSize, streamContext.getNumberOfParts());
-        for (int partIdx = 0; partIdx < partCount; partIdx++) {
-            int finalPartIdx = partIdx;
-            long expectedPartSize = (partIdx == partCount - 1) ? lastPartSize : partSize;
-            threads[partIdx] = new Thread(() -> {
+        try {
+            for (int partIdx = 0; partIdx < partCount; partIdx++) {
+                int finalPartIdx = partIdx;
+                long expectedPartSize = (partIdx == partCount - 1) ? lastPartSize : partSize;
+                threads[partIdx] = new Thread(() -> {
+                    try {
+                        InputStreamContainer inputStreamContainer = streamContext.provideStream(finalPartIdx);
+                        streams[finalPartIdx] = inputStreamContainer.getInputStream();
+                        assertEquals(expectedPartSize, inputStreamContainer.getContentLength());
+                    } catch (IOException e) {
+                        fail("IOException during stream creation");
+                    }
+                });
+                threads[partIdx].start();
+            }
+            for (int i = 0; i < partCount; i++) {
+                threads[i].join();
+            }
+        } finally {
+            Arrays.stream(streams).forEach(stream -> {
                 try {
-                    InputStreamContainer inputStreamContainer = streamContext.provideStream(finalPartIdx);
-                    assertEquals(expectedPartSize, inputStreamContainer.getContentLength());
+                    stream.close();
                 } catch (IOException e) {
-                    fail("IOException during stream creation");
+                    throw new RuntimeException(e);
                 }
             });
-            threads[partIdx].start();
-        }
-        for (int i = 0; i < partCount; i++) {
-            threads[i].join();
         }
     }
 
@@ -182,6 +209,7 @@ public OffsetRangeInputStream get(long size, long position) throws IOException {
     }
 
     private void testTypeOfProvidedStreams(boolean isRemoteDataIntegritySupported) throws IOException {
+        InputStream inputStream = null;
         try (
             RemoteTransferContainer remoteTransferContainer = new RemoteTransferContainer(
                 testFile.getFileName().toString(),
@@ -201,12 +229,132 @@ public OffsetRangeInputStream get(long size, long position) throws IOException {
         ) {
             StreamContext streamContext = remoteTransferContainer.supplyStreamContext(16);
             InputStreamContainer inputStreamContainer = streamContext.provideStream(0);
+            inputStream = inputStreamContainer.getInputStream();
             if (shouldOffsetInputStreamsBeChecked(isRemoteDataIntegritySupported)) {
                 assertTrue(inputStreamContainer.getInputStream() instanceof ResettableCheckedInputStream);
             } else {
                 assertTrue(inputStreamContainer.getInputStream() instanceof OffsetRangeInputStream);
             }
             assertThrows(RuntimeException.class, () -> remoteTransferContainer.supplyStreamContext(16));
+        } finally {
+            if (inputStream != null) {
+                inputStream.close();
+            }
+        }
+    }
+
+    public void testCloseDuringOngoingReadOnStream() throws IOException, InterruptedException {
+        Supplier<RateLimiter> rateLimiterSupplier = Mockito.mock(Supplier.class);
+        Mockito.when(rateLimiterSupplier.get()).thenReturn(null);
+        CountDownLatch readInvokedLatch = new CountDownLatch(1);
+        AtomicBoolean readAfterClose = new AtomicBoolean();
+        CountDownLatch streamClosed = new CountDownLatch(1);
+        AtomicBoolean indexInputClosed = new AtomicBoolean();
+        AtomicInteger closedCount = new AtomicInteger();
+        try (
+            RemoteTransferContainer remoteTransferContainer = new RemoteTransferContainer(
+                testFile.getFileName().toString(),
+                testFile.getFileName().toString(),
+                TEST_FILE_SIZE_BYTES,
+                true,
+                WritePriority.NORMAL,
+                new RemoteTransferContainer.OffsetRangeInputStreamSupplier() {
+                    @Override
+                    public OffsetRangeInputStream get(long size, long position) throws IOException {
+                        IndexInput indexInput = Mockito.mock(IndexInput.class);
+                        Mockito.doAnswer(invocation -> {
+                            indexInputClosed.set(true);
+                            closedCount.incrementAndGet();
+                            return null;
+                        }).when(indexInput).close();
+                        Mockito.when(indexInput.getFilePointer()).thenAnswer((Answer<Long>) invocation -> {
+                            if (readAfterClose.get() == false) {
+                                return 0L;
+                            }
+                            readInvokedLatch.countDown();
+                            boolean closedSuccess = streamClosed.await(30, TimeUnit.SECONDS);
+                            assertTrue(closedSuccess);
+                            assertFalse(indexInputClosed.get());
+                            return 0L;
+                        });
+
+                        OffsetRangeIndexInputStream offsetRangeIndexInputStream = new OffsetRangeIndexInputStream(
+                            indexInput,
+                            size,
+                            position
+                        );
+                        return new RateLimitingOffsetRangeInputStream(offsetRangeIndexInputStream, rateLimiterSupplier, null);
+                    }
+                },
+                0,
+                true
+            )
+        ) {
+            StreamContext streamContext = remoteTransferContainer.supplyStreamContext(16);
+            InputStreamContainer inputStreamContainer = streamContext.provideStream(0);
+            assertTrue(inputStreamContainer.getInputStream() instanceof RateLimitingOffsetRangeInputStream);
+            CountDownLatch latch = new CountDownLatch(1);
+            new Thread(() -> {
+                try {
+                    readAfterClose.set(true);
+                    inputStreamContainer.getInputStream().readAllBytes();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                } finally {
+                    latch.countDown();
+                }
+            }).start();
+            boolean successReadWait = readInvokedLatch.await(30, TimeUnit.SECONDS);
+            assertTrue(successReadWait);
+            // Closing stream here. Test Multiple invocations of close. Shouldn't throw any exception
+            inputStreamContainer.getInputStream().close();
+            inputStreamContainer.getInputStream().close();
+            inputStreamContainer.getInputStream().close();
+            streamClosed.countDown();
+            boolean processed = latch.await(30, TimeUnit.SECONDS);
+            assertTrue(processed);
+            assertTrue(readAfterClose.get());
+            assertTrue(indexInputClosed.get());
+
+            // Test Multiple invocations of close. Close count should always be 1.
+            inputStreamContainer.getInputStream().close();
+            inputStreamContainer.getInputStream().close();
+            inputStreamContainer.getInputStream().close();
+            assertEquals(1, closedCount.get());
+
+        }
+    }
+
+    public void testReadAccessWhenStreamClosed() throws IOException {
+        Supplier<RateLimiter> rateLimiterSupplier = Mockito.mock(Supplier.class);
+        Mockito.when(rateLimiterSupplier.get()).thenReturn(null);
+        try (
+            RemoteTransferContainer remoteTransferContainer = new RemoteTransferContainer(
+                testFile.getFileName().toString(),
+                testFile.getFileName().toString(),
+                TEST_FILE_SIZE_BYTES,
+                true,
+                WritePriority.NORMAL,
+                new RemoteTransferContainer.OffsetRangeInputStreamSupplier() {
+                    @Override
+                    public OffsetRangeInputStream get(long size, long position) throws IOException {
+                        IndexInput indexInput = Mockito.mock(IndexInput.class);
+                        OffsetRangeIndexInputStream offsetRangeIndexInputStream = new OffsetRangeIndexInputStream(
+                            indexInput,
+                            size,
+                            position
+                        );
+                        return new RateLimitingOffsetRangeInputStream(offsetRangeIndexInputStream, rateLimiterSupplier, null);
+                    }
+                },
+                0,
+                true
+            )
+        ) {
+            StreamContext streamContext = remoteTransferContainer.supplyStreamContext(16);
+            InputStreamContainer inputStreamContainer = streamContext.provideStream(0);
+            inputStreamContainer.getInputStream().close();
+            assertThrows(AlreadyClosedException.class, () -> inputStreamContainer.getInputStream().readAllBytes());
         }
     }
 
diff --git a/server/src/test/java/org/opensearch/gateway/AsyncShardFetchTests.java b/server/src/test/java/org/opensearch/gateway/AsyncShardFetchTests.java
index 31a27503069d7..4e5e9c71e1fe4 100644
--- a/server/src/test/java/org/opensearch/gateway/AsyncShardFetchTests.java
+++ b/server/src/test/java/org/opensearch/gateway/AsyncShardFetchTests.java
@@ -39,6 +39,7 @@
 import org.opensearch.cluster.node.DiscoveryNodeRole;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.core.index.shard.ShardId;
+import org.opensearch.indices.store.ShardAttributes;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.TestThreadPool;
 import org.opensearch.threadpool.ThreadPool;
@@ -46,12 +47,13 @@
 import org.junit.Before;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static java.util.Collections.emptySet;
+import static java.util.Collections.emptyMap;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.sameInstance;
 
@@ -84,7 +86,16 @@ public class AsyncShardFetchTests extends OpenSearchTestCase {
     public void setUp() throws Exception {
         super.setUp();
         this.threadPool = new TestThreadPool(getTestName());
-        this.test = new TestFetch(threadPool);
+        if (randomBoolean()) {
+            this.test = new TestFetch(threadPool);
+        } else {
+            HashMap<ShardId, ShardAttributes> shardToCustomDataPath = new HashMap<>();
+            ShardId shardId0 = new ShardId("index1", "index_uuid1", 0);
+            ShardId shardId1 = new ShardId("index2", "index_uuid2", 0);
+            shardToCustomDataPath.put(shardId0, new ShardAttributes(shardId0, ""));
+            shardToCustomDataPath.put(shardId1, new ShardAttributes(shardId1, ""));
+            this.test = new TestFetch(threadPool, shardToCustomDataPath);
+        }
     }
 
     @After
@@ -97,7 +108,7 @@ public void testClose() throws Exception {
         test.addSimulation(node1.getId(), response1);
 
         // first fetch, no data, still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -107,7 +118,7 @@ public void testClose() throws Exception {
         assertThat(test.reroute.get(), equalTo(1));
         test.close();
         try {
-            test.fetchData(nodes, emptySet());
+            test.fetchData(nodes, emptyMap());
             fail("fetch data should fail when closed");
         } catch (IllegalStateException e) {
             // all is well
@@ -119,7 +130,7 @@ public void testFullCircleSingleNodeSuccess() throws Exception {
         test.addSimulation(node1.getId(), response1);
 
         // first fetch, no data, still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -127,7 +138,7 @@ public void testFullCircleSingleNodeSuccess() throws Exception {
         test.fireSimulationAndWait(node1.getId());
         // verify we get back the data node
         assertThat(test.reroute.get(), equalTo(1));
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(1));
         assertThat(fetchData.getData().get(node1), sameInstance(response1));
@@ -139,7 +150,7 @@ public void testFullCircleSingleNodeFailure() throws Exception {
         test.addSimulation(node1.getId(), failure1);
 
         // first fetch, no data, still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -147,19 +158,19 @@ public void testFullCircleSingleNodeFailure() throws Exception {
         test.fireSimulationAndWait(node1.getId());
         // failure, fetched data exists, but has no data
         assertThat(test.reroute.get(), equalTo(1));
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(0));
 
         // on failure, we reset the failure on a successive call to fetchData, and try again afterwards
         test.addSimulation(node1.getId(), response1);
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
 
         test.fireSimulationAndWait(node1.getId());
         // 2 reroutes, cause we have a failure that we clear
         assertThat(test.reroute.get(), equalTo(3));
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(1));
         assertThat(fetchData.getData().get(node1), sameInstance(response1));
@@ -170,7 +181,7 @@ public void testIgnoreResponseFromDifferentRound() throws Exception {
         test.addSimulation(node1.getId(), response1);
 
         // first fetch, no data, still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -183,7 +194,7 @@ public void testIgnoreResponseFromDifferentRound() throws Exception {
         test.fireSimulationAndWait(node1.getId());
         // verify we get back the data node
         assertThat(test.reroute.get(), equalTo(2));
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(1));
         assertThat(fetchData.getData().get(node1), sameInstance(response1));
@@ -195,7 +206,7 @@ public void testIgnoreFailureFromDifferentRound() throws Exception {
         test.addSimulation(node1.getId(), failure1);
 
         // first fetch, no data, still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -212,7 +223,7 @@ public void testIgnoreFailureFromDifferentRound() throws Exception {
         test.fireSimulationAndWait(node1.getId());
         // failure, fetched data exists, but has no data
         assertThat(test.reroute.get(), equalTo(2));
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(0));
     }
@@ -223,7 +234,7 @@ public void testTwoNodesOnSetup() throws Exception {
         test.addSimulation(node2.getId(), response2);
 
         // no fetched data, 2 requests still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -231,14 +242,14 @@ public void testTwoNodesOnSetup() throws Exception {
         test.fireSimulationAndWait(node1.getId());
         // there is still another on going request, so no data
         assertThat(test.getNumberOfInFlightFetches(), equalTo(1));
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
 
         // fire the second simulation, this should allow us to get the data
         test.fireSimulationAndWait(node2.getId());
         // no more ongoing requests, we should fetch the data
         assertThat(test.reroute.get(), equalTo(2));
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(2));
         assertThat(fetchData.getData().get(node1), sameInstance(response1));
@@ -251,21 +262,21 @@ public void testTwoNodesOnSetupAndFailure() throws Exception {
         test.addSimulation(node2.getId(), failure2);
 
         // no fetched data, 2 requests still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
         // fire the first response, it should trigger a reroute
         test.fireSimulationAndWait(node1.getId());
         assertThat(test.reroute.get(), equalTo(1));
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
 
         // fire the second simulation, this should allow us to get the data
         test.fireSimulationAndWait(node2.getId());
         assertThat(test.reroute.get(), equalTo(2));
         // since one of those failed, we should only have one entry
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(1));
         assertThat(fetchData.getData().get(node1), sameInstance(response1));
@@ -276,7 +287,7 @@ public void testTwoNodesAddedInBetween() throws Exception {
         test.addSimulation(node1.getId(), response1);
 
         // no fetched data, 2 requests still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -287,14 +298,14 @@ public void testTwoNodesAddedInBetween() throws Exception {
         nodes = DiscoveryNodes.builder(nodes).add(node2).build();
         test.addSimulation(node2.getId(), response2);
         // no fetch data, has a new node introduced
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
 
         // fire the second simulation, this should allow us to get the data
         test.fireSimulationAndWait(node2.getId());
 
         // since one of those failed, we should only have one entry
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(2));
         assertThat(fetchData.getData().get(node1), sameInstance(response1));
@@ -309,7 +320,7 @@ public void testClearCache() throws Exception {
         test.clearCacheForNode(node1.getId());
 
         // no fetched data, request still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -317,13 +328,13 @@ public void testClearCache() throws Exception {
         assertThat(test.reroute.get(), equalTo(1));
 
         // verify we get back right data from node
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(1));
         assertThat(fetchData.getData().get(node1), sameInstance(response1));
 
         // second fetch gets same data
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(1));
         assertThat(fetchData.getData().get(node1), sameInstance(response1));
@@ -334,14 +345,14 @@ public void testClearCache() throws Exception {
         test.addSimulation(node1.getId(), response1_2);
 
         // no fetched data, new request on going
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
 
         test.fireSimulationAndWait(node1.getId());
         assertThat(test.reroute.get(), equalTo(2));
 
         // verify we get new data back
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(1));
         assertThat(fetchData.getData().get(node1), sameInstance(response1_2));
@@ -352,7 +363,7 @@ public void testConcurrentRequestAndClearCache() throws Exception {
         test.addSimulation(node1.getId(), response1);
 
         // no fetched data, request still on going
-        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptySet());
+        AsyncShardFetch.FetchResult<Response> fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
         assertThat(test.reroute.get(), equalTo(0));
 
@@ -366,14 +377,14 @@ public void testConcurrentRequestAndClearCache() throws Exception {
         test.addSimulation(node1.getId(), response1_2);
 
         // verify still no fetched data, request still on going
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(false));
 
         test.fireSimulationAndWait(node1.getId());
         assertThat(test.reroute.get(), equalTo(2));
 
         // verify we get new data back
-        fetchData = test.fetchData(nodes, emptySet());
+        fetchData = test.fetchData(nodes, emptyMap());
         assertThat(fetchData.hasData(), equalTo(true));
         assertThat(fetchData.getData().size(), equalTo(1));
         assertThat(fetchData.getData().get(node1), sameInstance(response1_2));
@@ -403,6 +414,11 @@ static class Entry {
             this.threadPool = threadPool;
         }
 
+        TestFetch(ThreadPool threadPool, Map<ShardId, ShardAttributes> shardAttributesMap) {
+            super(LogManager.getLogger(TestFetch.class), "test", shardAttributesMap, null, "test-batch");
+            this.threadPool = threadPool;
+        }
+
         public void addSimulation(String nodeId, Response response) {
             simulations.put(nodeId, new Entry(response, null));
         }
@@ -418,7 +434,7 @@ public void fireSimulationAndWait(String nodeId) throws InterruptedException {
         }
 
         @Override
-        protected void reroute(ShardId shardId, String reason) {
+        protected void reroute(String shardId, String reason) {
             reroute.incrementAndGet();
         }
 
diff --git a/server/src/test/java/org/opensearch/gateway/PrimaryShardAllocatorTests.java b/server/src/test/java/org/opensearch/gateway/PrimaryShardAllocatorTests.java
index c31ce60cb96a1..dceda6433575c 100644
--- a/server/src/test/java/org/opensearch/gateway/PrimaryShardAllocatorTests.java
+++ b/server/src/test/java/org/opensearch/gateway/PrimaryShardAllocatorTests.java
@@ -857,7 +857,11 @@ protected AsyncShardFetch.FetchResult<TransportNodesListGatewayStartedShards.Nod
             ShardRouting shard,
             RoutingAllocation allocation
         ) {
-            return new AsyncShardFetch.FetchResult<>(shardId, data, Collections.<String>emptySet());
+            return new AsyncShardFetch.FetchResult<>(data, new HashMap<>() {
+                {
+                    put(shardId, Collections.<String>emptySet());
+                }
+            });
         }
     }
 }
diff --git a/server/src/test/java/org/opensearch/gateway/ReplicaShardAllocatorTests.java b/server/src/test/java/org/opensearch/gateway/ReplicaShardAllocatorTests.java
index 3eeebd8cab6e4..5833d9c4f187f 100644
--- a/server/src/test/java/org/opensearch/gateway/ReplicaShardAllocatorTests.java
+++ b/server/src/test/java/org/opensearch/gateway/ReplicaShardAllocatorTests.java
@@ -728,7 +728,11 @@ protected AsyncShardFetch.FetchResult<TransportNodesListShardStoreMetadata.NodeS
                     );
                 }
             }
-            return new AsyncShardFetch.FetchResult<>(shardId, tData, Collections.emptySet());
+            return new AsyncShardFetch.FetchResult<>(tData, new HashMap<>() {
+                {
+                    put(shardId, Collections.emptySet());
+                }
+            });
         }
 
         @Override
diff --git a/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldAnalyzerModeTests.java b/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldAnalyzerModeTests.java
new file mode 100644
index 0000000000000..13cb279418fa8
--- /dev/null
+++ b/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldAnalyzerModeTests.java
@@ -0,0 +1,16 @@
+/*
+ * 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.mapper;
+
+public class MatchOnlyTextFieldAnalyzerModeTests extends TextFieldAnalyzerModeTests {
+    @Override
+    ParametrizedFieldMapper.TypeParser getTypeParser() {
+        return MatchOnlyTextFieldMapper.PARSER;
+    }
+}
diff --git a/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldMapperTests.java
new file mode 100644
index 0000000000000..580f8cccc9af5
--- /dev/null
+++ b/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldMapperTests.java
@@ -0,0 +1,450 @@
+/*
+ * 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.mapper;
+
+import org.apache.lucene.index.DocValuesType;
+import org.apache.lucene.index.IndexOptions;
+import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.IndexableFieldType;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.MultiPhraseQuery;
+import org.apache.lucene.search.PhraseQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.tests.analysis.MockSynonymAnalyzer;
+import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.MediaTypeRegistry;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.query.SourceFieldMatchQuery;
+import org.opensearch.index.search.MatchQuery;
+import org.junit.Before;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.core.Is.is;
+
+public class MatchOnlyTextFieldMapperTests extends TextFieldMapperTests {
+
+    @Before
+    public void setupMatchOnlyTextFieldMapper() {
+        textFieldName = "match_only_text";
+    }
+
+    @Override
+    public void testDefaults() throws IOException {
+        DocumentMapper mapper = createDocumentMapper(fieldMapping(this::minimalMapping));
+        assertEquals(fieldMapping(this::minimalMapping).toString(), mapper.mappingSource().toString());
+
+        ParsedDocument doc = mapper.parse(source(b -> b.field("field", "1234")));
+        IndexableField[] fields = doc.rootDoc().getFields("field");
+        assertEquals(1, fields.length);
+        assertEquals("1234", fields[0].stringValue());
+        IndexableFieldType fieldType = fields[0].fieldType();
+        assertThat(fieldType.omitNorms(), equalTo(true));
+        assertTrue(fieldType.tokenized());
+        assertFalse(fieldType.stored());
+        assertThat(fieldType.indexOptions(), equalTo(IndexOptions.DOCS));
+        assertThat(fieldType.storeTermVectors(), equalTo(false));
+        assertThat(fieldType.storeTermVectorOffsets(), equalTo(false));
+        assertThat(fieldType.storeTermVectorPositions(), equalTo(false));
+        assertThat(fieldType.storeTermVectorPayloads(), equalTo(false));
+        assertEquals(DocValuesType.NONE, fieldType.docValuesType());
+    }
+
+    @Override
+    public void testEnableStore() throws IOException {
+        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", textFieldName).field("store", true)));
+        ParsedDocument doc = mapper.parse(source(b -> b.field("field", "1234")));
+        IndexableField[] fields = doc.rootDoc().getFields("field");
+        assertEquals(1, fields.length);
+        assertTrue(fields[0].fieldType().stored());
+    }
+
+    @Override
+    public void testIndexOptions() throws IOException {
+        Map<String, IndexOptions> supportedOptions = new HashMap<>();
+        supportedOptions.put("docs", IndexOptions.DOCS);
+
+        Map<String, IndexOptions> unsupportedOptions = new HashMap<>();
+        unsupportedOptions.put("freqs", IndexOptions.DOCS_AND_FREQS);
+        unsupportedOptions.put("positions", IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
+        unsupportedOptions.put("offsets", IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS);
+
+        for (String option : supportedOptions.keySet()) {
+            XContentBuilder mapping = MediaTypeRegistry.JSON.contentBuilder().startObject().startObject("_doc").startObject("properties");
+            mapping.startObject(option).field("type", textFieldName).field("index_options", option).endObject();
+            mapping.endObject().endObject().endObject();
+
+            DocumentMapper mapper = createDocumentMapper(mapping);
+            String serialized = Strings.toString(MediaTypeRegistry.JSON, mapper);
+            assertThat(serialized, containsString("\"docs\":{\"type\":\"match_only_text\"}"));
+
+            ParsedDocument doc = mapper.parse(source(b -> { b.field(option, "1234"); }));
+
+            IndexOptions options = supportedOptions.get(option);
+            IndexableField[] fields = doc.rootDoc().getFields(option);
+            assertEquals(1, fields.length);
+            assertEquals(options, fields[0].fieldType().indexOptions());
+        }
+
+        for (String option : unsupportedOptions.keySet()) {
+            XContentBuilder mapping = MediaTypeRegistry.JSON.contentBuilder().startObject().startObject("_doc").startObject("properties");
+            mapping.startObject(option).field("type", textFieldName).field("index_options", option).endObject();
+            mapping.endObject().endObject().endObject();
+            MapperParsingException e = expectThrows(MapperParsingException.class, () -> createDocumentMapper(mapping));
+            assertThat(
+                e.getMessage(),
+                containsString(
+                    "Failed to parse mapping [_doc]: Unknown value [" + option + "] for field [index_options] - accepted values are [docs]"
+                )
+            );
+        }
+    }
+
+    @Override
+    public void testAnalyzedFieldPositionIncrementWithoutPositions() {
+        for (String indexOptions : List.of("docs")) {
+            try {
+                createDocumentMapper(
+                    fieldMapping(
+                        b -> b.field("type", textFieldName).field("index_options", indexOptions).field("position_increment_gap", 10)
+                    )
+                );
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @Override
+    public void testBWCSerialization() throws IOException {}
+
+    @Override
+    public void testPositionIncrementGap() throws IOException {}
+
+    @Override
+    public void testDefaultPositionIncrementGap() throws IOException {}
+
+    @Override
+    public void testMinimalToMaximal() throws IOException {}
+
+    @Override
+    public void testIndexPrefixMapping() throws IOException {
+        MapperParsingException e = expectThrows(
+            MapperParsingException.class,
+            () -> createDocumentMapper(
+                fieldMapping(
+                    b -> b.field("type", textFieldName)
+                        .field("analyzer", "standard")
+                        .startObject("index_prefixes")
+                        .field("min_chars", 2)
+                        .field("max_chars", 10)
+                        .endObject()
+                )
+            )
+        );
+        assertEquals(
+            "Failed to parse mapping [_doc]: Index prefixes cannot be enabled on for match_only_text field. Use text field instead",
+            e.getMessage()
+        );
+    }
+
+    @Override
+    public void testIndexPrefixIndexTypes() throws IOException {
+        // not supported and asserted the expected behavior in testIndexPrefixMapping
+    }
+
+    @Override
+    public void testFastPhrasePrefixes() throws IOException {
+        // not supported and asserted the expected behavior in testIndexPrefixMapping
+    }
+
+    public void testPhrasePrefixes() throws IOException {
+        MapperService mapperService = createMapperService(mapping(b -> {
+            b.startObject("field");
+            {
+                b.field("type", textFieldName);
+                b.field("analyzer", "my_stop_analyzer"); // "standard" will be replaced with MockSynonymAnalyzer
+            }
+            b.endObject();
+            b.startObject("synfield");
+            {
+                b.field("type", textFieldName);
+                b.field("analyzer", "standard"); // "standard" will be replaced with MockSynonymAnalyzer
+            }
+            b.endObject();
+        }));
+        QueryShardContext queryShardContext = createQueryShardContext(mapperService);
+
+        {
+            Query q = new MatchPhrasePrefixQueryBuilder("field", "two words").toQuery(queryShardContext);
+            MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery("field");
+            mqb.add(new Term("field", "words"));
+            MultiPhrasePrefixQuery mqbFilter = new MultiPhrasePrefixQuery("field");
+            mqbFilter.add(new Term("field", "two"));
+            mqbFilter.add(new Term("field", "words"));
+            Query expected = new SourceFieldMatchQuery(
+                new BooleanQuery.Builder().add(new TermQuery(new Term("field", "two")), BooleanClause.Occur.FILTER)
+                    .add(mqb, BooleanClause.Occur.FILTER)
+                    .build(),
+                mqbFilter,
+                mapperService.fieldType("field"),
+                queryShardContext
+            );
+            assertThat(q, equalTo(expected));
+        }
+
+        {
+            Query q = new MatchPhrasePrefixQueryBuilder("field", "three words here").toQuery(queryShardContext);
+            MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery("field");
+            mqb.add(new Term("field", "here"));
+            MultiPhrasePrefixQuery mqbFilter = new MultiPhrasePrefixQuery("field");
+            mqbFilter.add(new Term("field", "three"));
+            mqbFilter.add(new Term("field", "words"));
+            mqbFilter.add(new Term("field", "here"));
+            Query expected = new SourceFieldMatchQuery(
+                new BooleanQuery.Builder().add(new TermQuery(new Term("field", "three")), BooleanClause.Occur.FILTER)
+                    .add(new TermQuery(new Term("field", "words")), BooleanClause.Occur.FILTER)
+                    .add(mqb, BooleanClause.Occur.FILTER)
+                    .build(),
+                mqbFilter,
+                mapperService.fieldType("field"),
+                queryShardContext
+            );
+            assertThat(q, equalTo(expected));
+        }
+
+        {
+            Query q = new MatchPhrasePrefixQueryBuilder("field", "two words").slop(1).toQuery(queryShardContext);
+            MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery("field");
+            mqb.add(new Term("field", "words"));
+            MultiPhrasePrefixQuery mqbFilter = new MultiPhrasePrefixQuery("field");
+            mqbFilter.setSlop(1);
+            mqbFilter.add(new Term("field", "two"));
+            mqbFilter.add(new Term("field", "words"));
+            Query expected = new SourceFieldMatchQuery(
+                new BooleanQuery.Builder().add(new TermQuery(new Term("field", "two")), BooleanClause.Occur.FILTER)
+                    .add(mqb, BooleanClause.Occur.FILTER)
+                    .build(),
+                mqbFilter,
+                mapperService.fieldType("field"),
+                queryShardContext
+            );
+            assertThat(q, equalTo(expected));
+        }
+
+        {
+            Query q = new MatchPhrasePrefixQueryBuilder("field", "singleton").toQuery(queryShardContext);
+            MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery("field");
+            mqb.add(new Term("field", "singleton"));
+            Query expected = new SourceFieldMatchQuery(
+                new BooleanQuery.Builder().add(mqb, BooleanClause.Occur.FILTER).build(),
+                mqb,
+                mapperService.fieldType("field"),
+                queryShardContext
+            );
+            assertThat(q, is(expected));
+        }
+
+        {
+            Query q = new MatchPhrasePrefixQueryBuilder("field", "sparkle a stopword").toQuery(queryShardContext);
+            MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery("field");
+            mqb.add(new Term("field", "stopword"));
+            MultiPhrasePrefixQuery mqbFilter = new MultiPhrasePrefixQuery("field");
+            mqbFilter.add(new Term("field", "sparkle"));
+            mqbFilter.add(new Term[] { new Term("field", "stopword") }, 2);
+            Query expected = new SourceFieldMatchQuery(
+                new BooleanQuery.Builder().add(new TermQuery(new Term("field", "sparkle")), BooleanClause.Occur.FILTER)
+                    .add(mqb, BooleanClause.Occur.FILTER)
+                    .build(),
+                mqbFilter,
+                mapperService.fieldType("field"),
+                queryShardContext
+            );
+            assertThat(q, equalTo(expected));
+        }
+
+        {
+            MatchQuery matchQuery = new MatchQuery(queryShardContext);
+            matchQuery.setAnalyzer(new MockSynonymAnalyzer());
+            Query q = matchQuery.parse(MatchQuery.Type.PHRASE_PREFIX, "synfield", "motor dogs");
+            MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery("synfield");
+            mqb.add(new Term[] { new Term("synfield", "dogs"), new Term("synfield", "dog") });
+            MultiPhrasePrefixQuery mqbFilter = new MultiPhrasePrefixQuery("synfield");
+            mqbFilter.add(new Term("synfield", "motor"));
+            mqbFilter.add(new Term[] { new Term("synfield", "dogs"), new Term("synfield", "dog") });
+            Query expected = new SourceFieldMatchQuery(
+                new BooleanQuery.Builder().add(new TermQuery(new Term("synfield", "motor")), BooleanClause.Occur.FILTER)
+                    .add(mqb, BooleanClause.Occur.FILTER)
+                    .build(),
+                mqbFilter,
+                mapperService.fieldType("synfield"),
+                queryShardContext
+            );
+            assertThat(q, equalTo(expected));
+        }
+
+        {
+            MatchQuery matchQuery = new MatchQuery(queryShardContext);
+            matchQuery.setPhraseSlop(1);
+            matchQuery.setAnalyzer(new MockSynonymAnalyzer());
+            Query q = matchQuery.parse(MatchQuery.Type.PHRASE_PREFIX, "synfield", "two dogs");
+            MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery("synfield");
+            mqb.add(new Term[] { new Term("synfield", "dogs"), new Term("synfield", "dog") });
+            MultiPhrasePrefixQuery mqbFilter = new MultiPhrasePrefixQuery("synfield");
+            mqbFilter.add(new Term("synfield", "two"));
+            mqbFilter.add(new Term[] { new Term("synfield", "dogs"), new Term("synfield", "dog") });
+            mqbFilter.setSlop(1);
+            Query expected = new SourceFieldMatchQuery(
+                new BooleanQuery.Builder().add(new TermQuery(new Term("synfield", "two")), BooleanClause.Occur.FILTER)
+                    .add(mqb, BooleanClause.Occur.FILTER)
+                    .build(),
+                mqbFilter,
+                mapperService.fieldType("synfield"),
+                queryShardContext
+            );
+            assertThat(q, equalTo(expected));
+        }
+
+        {
+            MatchQuery matchQuery = new MatchQuery(queryShardContext);
+            matchQuery.setAnalyzer(new MockSynonymAnalyzer());
+            Query q = matchQuery.parse(MatchQuery.Type.PHRASE_PREFIX, "synfield", "three dogs word");
+            MultiPhrasePrefixQuery mqb = new MultiPhrasePrefixQuery("synfield");
+            mqb.add(new Term("synfield", "word"));
+            MultiPhrasePrefixQuery mqbFilter = new MultiPhrasePrefixQuery("synfield");
+            mqbFilter.add(new Term("synfield", "three"));
+            mqbFilter.add(new Term[] { new Term("synfield", "dogs"), new Term("synfield", "dog") });
+            mqbFilter.add(new Term("synfield", "word"));
+            Query expected = new SourceFieldMatchQuery(
+                new BooleanQuery.Builder().add(new TermQuery(new Term("synfield", "three")), BooleanClause.Occur.FILTER)
+                    .add(
+                        new BooleanQuery.Builder().add(new TermQuery(new Term("synfield", "dogs")), BooleanClause.Occur.SHOULD)
+                            .add(new TermQuery(new Term("synfield", "dog")), BooleanClause.Occur.SHOULD)
+                            .build(),
+                        BooleanClause.Occur.FILTER
+                    )
+                    .add(mqb, BooleanClause.Occur.FILTER)
+                    .build(),
+                mqbFilter,
+                mapperService.fieldType("synfield"),
+                queryShardContext
+            );
+            assertThat(q, equalTo(expected));
+        }
+    }
+
+    @Override
+    public void testFastPhraseMapping() throws IOException {
+        MapperParsingException e = expectThrows(MapperParsingException.class, () -> createMapperService(mapping(b -> {
+            b.startObject("field")
+                .field("type", textFieldName)
+                .field("analyzer", "my_stop_analyzer")
+                .field("index_phrases", true)
+                .endObject();
+            // "standard" will be replaced with MockSynonymAnalyzer
+            b.startObject("synfield").field("type", textFieldName).field("analyzer", "standard").field("index_phrases", true).endObject();
+        })));
+        assertEquals(
+            "Failed to parse mapping [_doc]: Index phrases cannot be enabled on for match_only_text field. Use text field instead",
+            e.getMessage()
+        );
+    }
+
+    @Override
+    public void testSimpleMerge() throws IOException {}
+
+    public void testPhraseQuery() throws IOException {
+        MapperService mapperService = createMapperService(mapping(b -> {
+            b.startObject("field").field("type", textFieldName).field("analyzer", "my_stop_analyzer").endObject();
+            // "standard" will be replaced with MockSynonymAnalyzer
+            b.startObject("synfield").field("type", textFieldName).field("analyzer", "standard").endObject();
+        }));
+        QueryShardContext queryShardContext = createQueryShardContext(mapperService);
+
+        Query q = new MatchPhraseQueryBuilder("field", "two words").toQuery(queryShardContext);
+        Query expectedQuery = new SourceFieldMatchQuery(
+            new BooleanQuery.Builder().add(new TermQuery(new Term("field", "two")), BooleanClause.Occur.FILTER)
+                .add(new TermQuery(new Term("field", "words")), BooleanClause.Occur.FILTER)
+                .build(),
+            new PhraseQuery("field", "two", "words"),
+            mapperService.fieldType("field"),
+            queryShardContext
+        );
+
+        assertThat(q, is(expectedQuery));
+        Query q4 = new MatchPhraseQueryBuilder("field", "singleton").toQuery(queryShardContext);
+        assertThat(q4, is(new TermQuery(new Term("field", "singleton"))));
+
+        Query q2 = new MatchPhraseQueryBuilder("field", "three words here").toQuery(queryShardContext);
+        expectedQuery = new SourceFieldMatchQuery(
+            new BooleanQuery.Builder().add(new TermQuery(new Term("field", "three")), BooleanClause.Occur.FILTER)
+                .add(new TermQuery(new Term("field", "words")), BooleanClause.Occur.FILTER)
+                .add(new TermQuery(new Term("field", "here")), BooleanClause.Occur.FILTER)
+                .build(),
+            new PhraseQuery("field", "three", "words", "here"),
+            mapperService.fieldType("field"),
+            queryShardContext
+        );
+        assertThat(q2, is(expectedQuery));
+
+        Query q3 = new MatchPhraseQueryBuilder("field", "two words").slop(2).toQuery(queryShardContext);
+        expectedQuery = new SourceFieldMatchQuery(
+            new BooleanQuery.Builder().add(new TermQuery(new Term("field", "two")), BooleanClause.Occur.FILTER)
+                .add(new TermQuery(new Term("field", "words")), BooleanClause.Occur.FILTER)
+                .build(),
+            new PhraseQuery(2, "field", "two", "words"),
+            mapperService.fieldType("field"),
+            queryShardContext
+        );
+        assertThat(q3, is(expectedQuery));
+
+        Query q5 = new MatchPhraseQueryBuilder("field", "sparkle a stopword").toQuery(queryShardContext);
+        expectedQuery = new SourceFieldMatchQuery(
+            new BooleanQuery.Builder().add(new TermQuery(new Term("field", "sparkle")), BooleanClause.Occur.FILTER)
+                .add(new TermQuery(new Term("field", "stopword")), BooleanClause.Occur.FILTER)
+                .build(),
+            new PhraseQuery.Builder().add(new Term("field", "sparkle")).add(new Term("field", "stopword"), 2).build(),
+            mapperService.fieldType("field"),
+            queryShardContext
+        );
+        assertThat(q5, is(expectedQuery));
+
+        MatchQuery matchQuery = new MatchQuery(queryShardContext);
+        matchQuery.setAnalyzer(new MockSynonymAnalyzer());
+        Query q6 = matchQuery.parse(MatchQuery.Type.PHRASE, "synfield", "motor dogs");
+        expectedQuery = new SourceFieldMatchQuery(
+            new BooleanQuery.Builder().add(new TermQuery(new Term("synfield", "motor")), BooleanClause.Occur.FILTER)
+                .add(
+                    new BooleanQuery.Builder().add(new TermQuery(new Term("synfield", "dogs")), BooleanClause.Occur.SHOULD)
+                        .add(new TermQuery(new Term("synfield", "dog")), BooleanClause.Occur.SHOULD)
+                        .build(),
+                    BooleanClause.Occur.FILTER
+                )
+                .build(),
+            new MultiPhraseQuery.Builder().add(new Term("synfield", "motor"))
+                .add(new Term[] { new Term("synfield", "dogs"), new Term("synfield", "dog") }, 1)
+                .build(),
+            mapperService.fieldType("synfield"),
+            queryShardContext
+        );
+        assertThat(q6, is(expectedQuery));
+    }
+}
diff --git a/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldTypeTests.java
new file mode 100644
index 0000000000000..51234fa04ddc2
--- /dev/null
+++ b/server/src/test/java/org/opensearch/index/mapper/MatchOnlyTextFieldTypeTests.java
@@ -0,0 +1,31 @@
+/*
+ * 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.mapper;
+
+import org.opensearch.common.lucene.Lucene;
+
+public class MatchOnlyTextFieldTypeTests extends TextFieldTypeTests {
+
+    @Override
+    TextFieldMapper.TextFieldType createFieldType(boolean searchable) {
+        TextSearchInfo tsi = new TextSearchInfo(
+            TextFieldMapper.Defaults.FIELD_TYPE,
+            null,
+            Lucene.STANDARD_ANALYZER,
+            Lucene.STANDARD_ANALYZER
+        );
+        return new MatchOnlyTextFieldMapper.MatchOnlyTextFieldType(
+            "field",
+            searchable,
+            false,
+            tsi,
+            ParametrizedFieldMapper.Parameter.metaParam().get()
+        );
+    }
+}
diff --git a/server/src/test/java/org/opensearch/index/mapper/TextFieldAnalyzerModeTests.java b/server/src/test/java/org/opensearch/index/mapper/TextFieldAnalyzerModeTests.java
index 93bed729f0974..83a3bdc580ae6 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TextFieldAnalyzerModeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TextFieldAnalyzerModeTests.java
@@ -59,6 +59,9 @@
 import static org.mockito.Mockito.when;
 
 public class TextFieldAnalyzerModeTests extends OpenSearchTestCase {
+    ParametrizedFieldMapper.TypeParser getTypeParser() {
+        return TextFieldMapper.PARSER;
+    }
 
     private static Map<String, NamedAnalyzer> defaultAnalyzers() {
         Map<String, NamedAnalyzer> analyzers = new HashMap<>();
@@ -101,7 +104,7 @@ public void testParseTextFieldCheckAnalyzerAnalysisMode() {
         IndexAnalyzers indexAnalyzers = new IndexAnalyzers(analyzers, Collections.emptyMap(), Collections.emptyMap());
         when(parserContext.getIndexAnalyzers()).thenReturn(indexAnalyzers);
 
-        TextFieldMapper.PARSER.parse("field", fieldNode, parserContext);
+        getTypeParser().parse("field", fieldNode, parserContext);
 
         // check that "analyzer" set to something that only supports AnalysisMode.SEARCH_TIME or AnalysisMode.INDEX_TIME is blocked
         AnalysisMode mode = randomFrom(AnalysisMode.SEARCH_TIME, AnalysisMode.INDEX_TIME);
@@ -110,7 +113,7 @@ public void testParseTextFieldCheckAnalyzerAnalysisMode() {
         indexAnalyzers = new IndexAnalyzers(analyzers, Collections.emptyMap(), Collections.emptyMap());
         when(parserContext.getIndexAnalyzers()).thenReturn(indexAnalyzers);
         fieldNode.put("analyzer", "my_analyzer");
-        MapperException ex = expectThrows(MapperException.class, () -> { TextFieldMapper.PARSER.parse("name", fieldNode, parserContext); });
+        MapperException ex = expectThrows(MapperException.class, () -> { getTypeParser().parse("name", fieldNode, parserContext); });
         assertThat(
             ex.getMessage(),
             containsString("analyzer [my_named_analyzer] contains filters [my_analyzer] that are not allowed to run")
@@ -136,7 +139,7 @@ public void testParseTextFieldCheckSearchAnalyzerAnalysisMode() {
 
             IndexAnalyzers indexAnalyzers = new IndexAnalyzers(analyzers, Collections.emptyMap(), Collections.emptyMap());
             when(parserContext.getIndexAnalyzers()).thenReturn(indexAnalyzers);
-            TextFieldMapper.PARSER.parse("textField", fieldNode, parserContext);
+            getTypeParser().parse("textField", fieldNode, parserContext);
 
             // check that "analyzer" set to AnalysisMode.INDEX_TIME is blocked
             mode = AnalysisMode.INDEX_TIME;
@@ -151,10 +154,7 @@ public void testParseTextFieldCheckSearchAnalyzerAnalysisMode() {
             if (settingToTest.equals("search_quote_analyzer")) {
                 fieldNode.put("search_analyzer", "standard");
             }
-            MapperException ex = expectThrows(
-                MapperException.class,
-                () -> { TextFieldMapper.PARSER.parse("field", fieldNode, parserContext); }
-            );
+            MapperException ex = expectThrows(MapperException.class, () -> { getTypeParser().parse("field", fieldNode, parserContext); });
             assertEquals(
                 "analyzer [my_named_analyzer] contains filters [my_analyzer] that are not allowed to run in search time mode.",
                 ex.getMessage()
@@ -174,10 +174,7 @@ public void testParseTextFieldCheckAnalyzerWithSearchAnalyzerAnalysisMode() {
         analyzers.put("my_analyzer", new NamedAnalyzer("my_named_analyzer", AnalyzerScope.INDEX, createAnalyzerWithMode(mode)));
         IndexAnalyzers indexAnalyzers = new IndexAnalyzers(analyzers, Collections.emptyMap(), Collections.emptyMap());
         when(parserContext.getIndexAnalyzers()).thenReturn(indexAnalyzers);
-        MapperException ex = expectThrows(
-            MapperException.class,
-            () -> { TextFieldMapper.PARSER.parse("field", fieldNode, parserContext); }
-        );
+        MapperException ex = expectThrows(MapperException.class, () -> { getTypeParser().parse("field", fieldNode, parserContext); });
         assertThat(
             ex.getMessage(),
             containsString("analyzer [my_named_analyzer] contains filters [my_analyzer] that are not allowed to run")
@@ -193,7 +190,6 @@ public void testParseTextFieldCheckAnalyzerWithSearchAnalyzerAnalysisMode() {
 
         indexAnalyzers = new IndexAnalyzers(analyzers, Collections.emptyMap(), Collections.emptyMap());
         when(parserContext.getIndexAnalyzers()).thenReturn(indexAnalyzers);
-        TextFieldMapper.PARSER.parse("field", fieldNode, parserContext);
+        getTypeParser().parse("field", fieldNode, parserContext);
     }
-
 }
diff --git a/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java
index a9b902e121bda..a22bfa5e845b1 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java
@@ -81,6 +81,7 @@
 import org.opensearch.index.query.MatchPhraseQueryBuilder;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.index.search.MatchQuery;
+import org.junit.Before;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -95,6 +96,13 @@
 
 public class TextFieldMapperTests extends MapperTestCase {
 
+    public String textFieldName = "text";
+
+    @Before
+    public void setup() {
+        textFieldName = "text";
+    }
+
     @Override
     protected void writeFieldValue(XContentBuilder builder) throws IOException {
         builder.value(1234);
@@ -169,30 +177,34 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
 
         checker.registerConflictCheck("index", b -> b.field("index", false));
         checker.registerConflictCheck("store", b -> b.field("store", true));
-        checker.registerConflictCheck("index_phrases", b -> b.field("index_phrases", true));
-        checker.registerConflictCheck("index_prefixes", b -> b.startObject("index_prefixes").endObject());
-        checker.registerConflictCheck("index_options", b -> b.field("index_options", "docs"));
+        if (!textFieldName.equals("match_only_text")) {
+            checker.registerConflictCheck("index_phrases", b -> b.field("index_phrases", true));
+            checker.registerConflictCheck("index_prefixes", b -> b.startObject("index_prefixes").endObject());
+            checker.registerConflictCheck("index_options", b -> b.field("index_options", "docs"));
+        }
         checker.registerConflictCheck("similarity", b -> b.field("similarity", "boolean"));
         checker.registerConflictCheck("analyzer", b -> b.field("analyzer", "keyword"));
         checker.registerConflictCheck("term_vector", b -> b.field("term_vector", "yes"));
 
         checker.registerConflictCheck("position_increment_gap", b -> b.field("position_increment_gap", 10));
 
-        // norms can be set from true to false, but not vice versa
-        checker.registerConflictCheck("norms", fieldMapping(b -> {
-            b.field("type", "text");
-            b.field("norms", false);
-        }), fieldMapping(b -> {
-            b.field("type", "text");
-            b.field("norms", true);
-        }));
-        checker.registerUpdateCheck(b -> {
-            b.field("type", "text");
-            b.field("norms", true);
-        }, b -> {
-            b.field("type", "text");
-            b.field("norms", false);
-        }, m -> assertFalse(m.fieldType().getTextSearchInfo().hasNorms()));
+        if (!textFieldName.equals(MatchOnlyTextFieldMapper.CONTENT_TYPE)) {
+            // norms can be set from true to false, but not vice versa
+            checker.registerConflictCheck("norms", fieldMapping(b -> {
+                b.field("type", textFieldName);
+                b.field("norms", false);
+            }), fieldMapping(b -> {
+                b.field("type", textFieldName);
+                b.field("norms", true);
+            }));
+            checker.registerUpdateCheck(b -> {
+                b.field("type", textFieldName);
+                b.field("norms", true);
+            }, b -> {
+                b.field("type", textFieldName);
+                b.field("norms", false);
+            }, m -> assertFalse(m.fieldType().getTextSearchInfo().hasNorms()));
+        }
 
         checker.registerUpdateCheck(b -> b.field("boost", 2.0), m -> assertEquals(m.fieldType().boost(), 2.0, 0));
 
@@ -237,7 +249,7 @@ public TokenStream create(TokenStream tokenStream) {
 
     @Override
     protected void minimalMapping(XContentBuilder b) throws IOException {
-        b.field("type", "text");
+        b.field("type", textFieldName);
     }
 
     public void testDefaults() throws IOException {
@@ -262,7 +274,7 @@ public void testDefaults() throws IOException {
 
     public void testBWCSerialization() throws IOException {
         MapperService mapperService = createMapperService(fieldMapping(b -> {
-            b.field("type", "text");
+            b.field("type", textFieldName);
             b.field("fielddata", true);
             b.startObject("fields");
             {
@@ -312,7 +324,7 @@ public void testBWCSerialization() throws IOException {
     }
 
     public void testEnableStore() throws IOException {
-        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "text").field("store", true)));
+        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", textFieldName).field("store", true)));
         ParsedDocument doc = mapper.parse(source(b -> b.field("field", "1234")));
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(1, fields.length);
@@ -320,14 +332,14 @@ public void testEnableStore() throws IOException {
     }
 
     public void testDisableIndex() throws IOException {
-        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "text").field("index", false)));
+        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", textFieldName).field("index", false)));
         ParsedDocument doc = mapper.parse(source(b -> b.field("field", "1234")));
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(0, fields.length);
     }
 
     public void testDisableNorms() throws IOException {
-        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "text").field("norms", false)));
+        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", textFieldName).field("norms", false)));
         ParsedDocument doc = mapper.parse(source(b -> b.field("field", "1234")));
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(1, fields.length);
@@ -343,7 +355,7 @@ public void testIndexOptions() throws IOException {
 
         XContentBuilder mapping = MediaTypeRegistry.JSON.contentBuilder().startObject().startObject("_doc").startObject("properties");
         for (String option : supportedOptions.keySet()) {
-            mapping.startObject(option).field("type", "text").field("index_options", option).endObject();
+            mapping.startObject(option).field("type", textFieldName).field("index_options", option).endObject();
         }
         mapping.endObject().endObject().endObject();
 
@@ -389,7 +401,7 @@ public void testDefaultPositionIncrementGap() throws IOException {
     public void testPositionIncrementGap() throws IOException {
         final int positionIncrementGap = randomIntBetween(1, 1000);
         MapperService mapperService = createMapperService(
-            fieldMapping(b -> b.field("type", "text").field("position_increment_gap", positionIncrementGap))
+            fieldMapping(b -> b.field("type", textFieldName).field("position_increment_gap", positionIncrementGap))
         );
         ParsedDocument doc = mapperService.documentMapper().parse(source(b -> b.array("field", new String[] { "a", "b" })));
 
@@ -409,16 +421,16 @@ public void testPositionIncrementGap() throws IOException {
 
     public void testSearchAnalyzerSerialization() throws IOException {
         XContentBuilder mapping = fieldMapping(
-            b -> b.field("type", "text").field("analyzer", "standard").field("search_analyzer", "keyword")
+            b -> b.field("type", textFieldName).field("analyzer", "standard").field("search_analyzer", "keyword")
         );
         assertEquals(mapping.toString(), createDocumentMapper(mapping).mappingSource().toString());
 
         // special case: default index analyzer
-        mapping = fieldMapping(b -> b.field("type", "text").field("analyzer", "default").field("search_analyzer", "keyword"));
+        mapping = fieldMapping(b -> b.field("type", textFieldName).field("analyzer", "default").field("search_analyzer", "keyword"));
         assertEquals(mapping.toString(), createDocumentMapper(mapping).mappingSource().toString());
 
         // special case: default search analyzer
-        mapping = fieldMapping(b -> b.field("type", "text").field("analyzer", "keyword").field("search_analyzer", "default"));
+        mapping = fieldMapping(b -> b.field("type", textFieldName).field("analyzer", "keyword").field("search_analyzer", "default"));
         assertEquals(mapping.toString(), createDocumentMapper(mapping).mappingSource().toString());
 
         XContentBuilder builder = MediaTypeRegistry.JSON.contentBuilder();
@@ -436,7 +448,7 @@ public void testSearchAnalyzerSerialization() throws IOException {
 
     public void testSearchQuoteAnalyzerSerialization() throws IOException {
         XContentBuilder mapping = fieldMapping(
-            b -> b.field("type", "text")
+            b -> b.field("type", textFieldName)
                 .field("analyzer", "standard")
                 .field("search_analyzer", "standard")
                 .field("search_quote_analyzer", "keyword")
@@ -445,7 +457,7 @@ public void testSearchQuoteAnalyzerSerialization() throws IOException {
 
         // special case: default index/search analyzer
         mapping = fieldMapping(
-            b -> b.field("type", "text")
+            b -> b.field("type", textFieldName)
                 .field("analyzer", "default")
                 .field("search_analyzer", "default")
                 .field("search_quote_analyzer", "keyword")
@@ -456,27 +468,27 @@ public void testSearchQuoteAnalyzerSerialization() throws IOException {
     public void testTermVectors() throws IOException {
         XContentBuilder mapping = mapping(
             b -> b.startObject("field1")
-                .field("type", "text")
+                .field("type", textFieldName)
                 .field("term_vector", "no")
                 .endObject()
                 .startObject("field2")
-                .field("type", "text")
+                .field("type", textFieldName)
                 .field("term_vector", "yes")
                 .endObject()
                 .startObject("field3")
-                .field("type", "text")
+                .field("type", textFieldName)
                 .field("term_vector", "with_offsets")
                 .endObject()
                 .startObject("field4")
-                .field("type", "text")
+                .field("type", textFieldName)
                 .field("term_vector", "with_positions")
                 .endObject()
                 .startObject("field5")
-                .field("type", "text")
+                .field("type", textFieldName)
                 .field("term_vector", "with_positions_offsets")
                 .endObject()
                 .startObject("field6")
-                .field("type", "text")
+                .field("type", textFieldName)
                 .field("term_vector", "with_positions_offsets_payloads")
                 .endObject()
         );
@@ -526,7 +538,9 @@ public void testTermVectors() throws IOException {
     }
 
     public void testEagerGlobalOrdinals() throws IOException {
-        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "text").field("eager_global_ordinals", true)));
+        DocumentMapper mapper = createDocumentMapper(
+            fieldMapping(b -> b.field("type", textFieldName).field("eager_global_ordinals", true))
+        );
 
         FieldMapper fieldMapper = (FieldMapper) mapper.mappers().getMapper("field");
         assertTrue(fieldMapper.fieldType().eagerGlobalOrdinals());
@@ -539,13 +553,13 @@ public void testFielddata() throws IOException {
         }));
         assertThat(e.getMessage(), containsString("Text fields are not optimised for operations that require per-document field data"));
 
-        MapperService enabledMapper = createMapperService(fieldMapping(b -> b.field("type", "text").field("fielddata", true)));
+        MapperService enabledMapper = createMapperService(fieldMapping(b -> b.field("type", textFieldName).field("fielddata", true)));
         enabledMapper.fieldType("field").fielddataBuilder("test", () -> { throw new UnsupportedOperationException(); }); // no exception
                                                                                                                          // this time
 
         e = expectThrows(
             MapperParsingException.class,
-            () -> createMapperService(fieldMapping(b -> b.field("type", "text").field("index", false).field("fielddata", true)))
+            () -> createMapperService(fieldMapping(b -> b.field("type", textFieldName).field("index", false).field("fielddata", true)))
         );
         assertThat(e.getMessage(), containsString("Cannot enable fielddata on a [text] field that is not indexed"));
     }
@@ -553,7 +567,7 @@ public void testFielddata() throws IOException {
     public void testFrequencyFilter() throws IOException {
         MapperService mapperService = createMapperService(
             fieldMapping(
-                b -> b.field("type", "text")
+                b -> b.field("type", textFieldName)
                     .field("fielddata", true)
                     .startObject("fielddata_frequency_filter")
                     .field("min", 2d)
@@ -571,17 +585,22 @@ public void testFrequencyFilter() throws IOException {
     public void testNullConfigValuesFail() throws MapperParsingException {
         Exception e = expectThrows(
             MapperParsingException.class,
-            () -> createDocumentMapper(fieldMapping(b -> b.field("type", "text").field("analyzer", (String) null)))
+            () -> createDocumentMapper(fieldMapping(b -> b.field("type", textFieldName).field("analyzer", (String) null)))
+        );
+        assertThat(
+            e.getMessage(),
+            containsString("[analyzer] on mapper [field] of type [" + textFieldName + "] must not have a [null] value")
         );
-        assertThat(e.getMessage(), containsString("[analyzer] on mapper [field] of type [text] must not have a [null] value"));
     }
 
     public void testNotIndexedFieldPositionIncrement() {
         Exception e = expectThrows(
             MapperParsingException.class,
-            () -> createDocumentMapper(fieldMapping(b -> b.field("type", "text").field("index", false).field("position_increment_gap", 10)))
+            () -> createDocumentMapper(
+                fieldMapping(b -> b.field("type", textFieldName).field("index", false).field("position_increment_gap", 10))
+            )
         );
-        assertThat(e.getMessage(), containsString("Cannot set position_increment_gap on field [field] without positions enabled"));
+        assertThat(e.getMessage(), containsString("Cannot set position_increment_gap on field [field]"));
     }
 
     public void testAnalyzedFieldPositionIncrementWithoutPositions() {
@@ -589,7 +608,9 @@ public void testAnalyzedFieldPositionIncrementWithoutPositions() {
             Exception e = expectThrows(
                 MapperParsingException.class,
                 () -> createDocumentMapper(
-                    fieldMapping(b -> b.field("type", "text").field("index_options", indexOptions).field("position_increment_gap", 10))
+                    fieldMapping(
+                        b -> b.field("type", textFieldName).field("index_options", indexOptions).field("position_increment_gap", 10)
+                    )
                 )
             );
             assertThat(e.getMessage(), containsString("Cannot set position_increment_gap on field [field] without positions enabled"));
@@ -600,7 +621,7 @@ public void testIndexPrefixIndexTypes() throws IOException {
         {
             DocumentMapper mapper = createDocumentMapper(
                 fieldMapping(
-                    b -> b.field("type", "text")
+                    b -> b.field("type", textFieldName)
                         .field("analyzer", "standard")
                         .startObject("index_prefixes")
                         .endObject()
@@ -615,7 +636,7 @@ public void testIndexPrefixIndexTypes() throws IOException {
         {
             DocumentMapper mapper = createDocumentMapper(
                 fieldMapping(
-                    b -> b.field("type", "text")
+                    b -> b.field("type", textFieldName)
                         .field("analyzer", "standard")
                         .startObject("index_prefixes")
                         .endObject()
@@ -632,7 +653,7 @@ public void testIndexPrefixIndexTypes() throws IOException {
         {
             DocumentMapper mapper = createDocumentMapper(
                 fieldMapping(
-                    b -> b.field("type", "text")
+                    b -> b.field("type", textFieldName)
                         .field("analyzer", "standard")
                         .startObject("index_prefixes")
                         .endObject()
@@ -649,7 +670,7 @@ public void testIndexPrefixIndexTypes() throws IOException {
         {
             DocumentMapper mapper = createDocumentMapper(
                 fieldMapping(
-                    b -> b.field("type", "text")
+                    b -> b.field("type", textFieldName)
                         .field("analyzer", "standard")
                         .startObject("index_prefixes")
                         .endObject()
@@ -666,7 +687,7 @@ public void testIndexPrefixIndexTypes() throws IOException {
         {
             DocumentMapper mapper = createDocumentMapper(
                 fieldMapping(
-                    b -> b.field("type", "text")
+                    b -> b.field("type", textFieldName)
                         .field("analyzer", "standard")
                         .startObject("index_prefixes")
                         .endObject()
@@ -682,62 +703,18 @@ public void testIndexPrefixIndexTypes() throws IOException {
     }
 
     public void testNestedIndexPrefixes() throws IOException {
-        {
-            MapperService mapperService = createMapperService(
-                mapping(
-                    b -> b.startObject("object")
-                        .field("type", "object")
-                        .startObject("properties")
-                        .startObject("field")
-                        .field("type", "text")
-                        .startObject("index_prefixes")
-                        .endObject()
-                        .endObject()
-                        .endObject()
-                        .endObject()
-                )
-            );
-            MappedFieldType textField = mapperService.fieldType("object.field");
-            assertNotNull(textField);
-            assertThat(textField, instanceOf(TextFieldType.class));
-            MappedFieldType prefix = ((TextFieldType) textField).getPrefixFieldType();
-            assertEquals(prefix.name(), "object.field._index_prefix");
-            FieldMapper mapper = (FieldMapper) mapperService.documentMapper().mappers().getMapper("object.field._index_prefix");
-            assertEquals(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, mapper.fieldType.indexOptions());
-            assertFalse(mapper.fieldType.storeTermVectorOffsets());
-        }
 
-        {
-            MapperService mapperService = createMapperService(
-                mapping(
-                    b -> b.startObject("body")
-                        .field("type", "text")
-                        .startObject("fields")
-                        .startObject("with_prefix")
-                        .field("type", "text")
-                        .startObject("index_prefixes")
-                        .endObject()
-                        .endObject()
-                        .endObject()
-                        .endObject()
-                )
-            );
-            MappedFieldType textField = mapperService.fieldType("body.with_prefix");
-            assertNotNull(textField);
-            assertThat(textField, instanceOf(TextFieldType.class));
-            MappedFieldType prefix = ((TextFieldType) textField).getPrefixFieldType();
-            assertEquals(prefix.name(), "body.with_prefix._index_prefix");
-            FieldMapper mapper = (FieldMapper) mapperService.documentMapper().mappers().getMapper("body.with_prefix._index_prefix");
-            assertEquals(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, mapper.fieldType.indexOptions());
-            assertFalse(mapper.fieldType.storeTermVectorOffsets());
-        }
     }
 
     public void testFastPhraseMapping() throws IOException {
         MapperService mapperService = createMapperService(mapping(b -> {
-            b.startObject("field").field("type", "text").field("analyzer", "my_stop_analyzer").field("index_phrases", true).endObject();
+            b.startObject("field")
+                .field("type", textFieldName)
+                .field("analyzer", "my_stop_analyzer")
+                .field("index_phrases", true)
+                .endObject();
             // "standard" will be replaced with MockSynonymAnalyzer
-            b.startObject("synfield").field("type", "text").field("analyzer", "standard").field("index_phrases", true).endObject();
+            b.startObject("synfield").field("type", textFieldName).field("analyzer", "standard").field("index_phrases", true).endObject();
         }));
         QueryShardContext queryShardContext = createQueryShardContext(mapperService);
 
@@ -808,14 +785,16 @@ protected TokenStreamComponents createComponents(String fieldName) {
 
         Exception e = expectThrows(
             MapperParsingException.class,
-            () -> createMapperService(fieldMapping(b -> b.field("type", "text").field("index", "false").field("index_phrases", true)))
+            () -> createMapperService(
+                fieldMapping(b -> b.field("type", textFieldName).field("index", "false").field("index_phrases", true))
+            )
         );
         assertThat(e.getMessage(), containsString("Cannot set index_phrases on unindexed field [field]"));
 
         e = expectThrows(
             MapperParsingException.class,
             () -> createMapperService(
-                fieldMapping(b -> b.field("type", "text").field("index_options", "freqs").field("index_phrases", true))
+                fieldMapping(b -> b.field("type", textFieldName).field("index_options", "freqs").field("index_phrases", true))
             )
         );
         assertThat(e.getMessage(), containsString("Cannot set index_phrases on field [field] if positions are not enabled"));
@@ -826,7 +805,7 @@ public void testIndexPrefixMapping() throws IOException {
         {
             DocumentMapper mapper = createDocumentMapper(
                 fieldMapping(
-                    b -> b.field("type", "text")
+                    b -> b.field("type", textFieldName)
                         .field("analyzer", "standard")
                         .startObject("index_prefixes")
                         .field("min_chars", 2)
@@ -844,29 +823,29 @@ public void testIndexPrefixMapping() throws IOException {
 
         {
             DocumentMapper mapper = createDocumentMapper(
-                fieldMapping(b -> b.field("type", "text").field("analyzer", "standard").startObject("index_prefixes").endObject())
+                fieldMapping(b -> b.field("type", textFieldName).field("analyzer", "standard").startObject("index_prefixes").endObject())
             );
             assertThat(mapper.mappers().getMapper("field._index_prefix").toString(), containsString("prefixChars=2:5"));
 
         }
 
         {
-            DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "text").nullField("index_prefixes")));
+            DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", textFieldName).nullField("index_prefixes")));
             assertNull(mapper.mappers().getMapper("field._index_prefix"));
         }
 
         {
             MapperParsingException e = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
-                b.field("type", "text").field("analyzer", "standard");
+                b.field("type", textFieldName).field("analyzer", "standard");
                 b.startObject("index_prefixes").field("min_chars", 1).field("max_chars", 10).endObject();
-                b.startObject("fields").startObject("_index_prefix").field("type", "text").endObject().endObject();
+                b.startObject("fields").startObject("_index_prefix").field("type", textFieldName).endObject().endObject();
             })));
             assertThat(e.getMessage(), containsString("Field [field._index_prefix] is defined more than once"));
         }
 
         {
             MapperParsingException e = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
-                b.field("type", "text").field("analyzer", "standard");
+                b.field("type", textFieldName).field("analyzer", "standard");
                 b.startObject("index_prefixes").field("min_chars", 11).field("max_chars", 10).endObject();
             })));
             assertThat(e.getMessage(), containsString("min_chars [11] must be less than max_chars [10]"));
@@ -874,7 +853,7 @@ public void testIndexPrefixMapping() throws IOException {
 
         {
             MapperParsingException e = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
-                b.field("type", "text").field("analyzer", "standard");
+                b.field("type", textFieldName).field("analyzer", "standard");
                 b.startObject("index_prefixes").field("min_chars", 0).field("max_chars", 10).endObject();
             })));
             assertThat(e.getMessage(), containsString("min_chars [0] must be greater than zero"));
@@ -882,7 +861,7 @@ public void testIndexPrefixMapping() throws IOException {
 
         {
             MapperParsingException e = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
-                b.field("type", "text").field("analyzer", "standard");
+                b.field("type", textFieldName).field("analyzer", "standard");
                 b.startObject("index_prefixes").field("min_chars", 1).field("max_chars", 25).endObject();
             })));
             assertThat(e.getMessage(), containsString("max_chars [25] must be less than 20"));
@@ -890,7 +869,7 @@ public void testIndexPrefixMapping() throws IOException {
 
         {
             MapperParsingException e = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
-                b.field("type", "text").field("analyzer", "standard").field("index", false);
+                b.field("type", textFieldName).field("analyzer", "standard").field("index", false);
                 b.startObject("index_prefixes").endObject();
             })));
             assertThat(e.getMessage(), containsString("Cannot set index_prefixes on unindexed field [field]"));
@@ -901,14 +880,14 @@ public void testFastPhrasePrefixes() throws IOException {
         MapperService mapperService = createMapperService(mapping(b -> {
             b.startObject("field");
             {
-                b.field("type", "text");
+                b.field("type", textFieldName);
                 b.field("analyzer", "my_stop_analyzer");
                 b.startObject("index_prefixes").field("min_chars", 2).field("max_chars", 10).endObject();
             }
             b.endObject();
             b.startObject("synfield");
             {
-                b.field("type", "text");
+                b.field("type", textFieldName);
                 b.field("analyzer", "standard"); // "standard" will be replaced with MockSynonymAnalyzer
                 b.field("index_phrases", true);
                 b.startObject("index_prefixes").field("min_chars", 2).field("max_chars", 10).endObject();
@@ -999,7 +978,7 @@ public void testFastPhrasePrefixes() throws IOException {
 
     public void testSimpleMerge() throws IOException {
         XContentBuilder startingMapping = fieldMapping(
-            b -> b.field("type", "text").startObject("index_prefixes").endObject().field("index_phrases", true)
+            b -> b.field("type", textFieldName).startObject("index_prefixes").endObject().field("index_phrases", true)
         );
         MapperService mapperService = createMapperService(startingMapping);
         assertThat(mapperService.documentMapper().mappers().getMapper("field"), instanceOf(TextFieldMapper.class));
@@ -1008,19 +987,28 @@ public void testSimpleMerge() throws IOException {
         assertThat(mapperService.documentMapper().mappers().getMapper("field"), instanceOf(TextFieldMapper.class));
 
         XContentBuilder differentPrefix = fieldMapping(
-            b -> b.field("type", "text").startObject("index_prefixes").field("min_chars", "3").endObject().field("index_phrases", true)
+            b -> b.field("type", textFieldName)
+                .startObject("index_prefixes")
+                .field("min_chars", "3")
+                .endObject()
+                .field("index_phrases", true)
         );
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> merge(mapperService, differentPrefix));
         assertThat(e.getMessage(), containsString("Cannot update parameter [index_prefixes]"));
 
         XContentBuilder differentPhrases = fieldMapping(
-            b -> b.field("type", "text").startObject("index_prefixes").endObject().field("index_phrases", false)
+            b -> b.field("type", textFieldName).startObject("index_prefixes").endObject().field("index_phrases", false)
         );
         e = expectThrows(IllegalArgumentException.class, () -> merge(mapperService, differentPhrases));
         assertThat(e.getMessage(), containsString("Cannot update parameter [index_phrases]"));
 
         XContentBuilder newField = mapping(b -> {
-            b.startObject("field").field("type", "text").startObject("index_prefixes").endObject().field("index_phrases", true).endObject();
+            b.startObject("field")
+                .field("type", textFieldName)
+                .startObject("index_prefixes")
+                .endObject()
+                .field("index_phrases", true)
+                .endObject();
             b.startObject("other_field").field("type", "keyword").endObject();
         });
         merge(mapperService, newField);
diff --git a/server/src/test/java/org/opensearch/index/mapper/TextFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/TextFieldTypeTests.java
index 0592a972db5e9..9c177bbec61fd 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TextFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TextFieldTypeTests.java
@@ -66,35 +66,39 @@
 
 public class TextFieldTypeTests extends FieldTypeTestCase {
 
-    private static TextFieldType createFieldType() {
-        return new TextFieldType("field");
+    TextFieldType createFieldType(boolean searchabe) {
+        if (searchabe) {
+            return new TextFieldType("field");
+        } else {
+            return new TextFieldType("field", false, false, Collections.emptyMap());
+        }
     }
 
     public void testIsAggregatableDependsOnFieldData() {
-        TextFieldType ft = createFieldType();
+        TextFieldType ft = createFieldType(true);
         assertFalse(ft.isAggregatable());
         ft.setFielddata(true);
         assertTrue(ft.isAggregatable());
     }
 
     public void testTermQuery() {
-        MappedFieldType ft = createFieldType();
+        MappedFieldType ft = createFieldType(true);
         assertEquals(new TermQuery(new Term("field", "foo")), ft.termQuery("foo", null));
         assertEquals(AutomatonQueries.caseInsensitiveTermQuery(new Term("field", "fOo")), ft.termQueryCaseInsensitive("fOo", null));
 
-        MappedFieldType unsearchable = new TextFieldType("field", false, false, Collections.emptyMap());
+        MappedFieldType unsearchable = createFieldType(false);
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> unsearchable.termQuery("bar", null));
         assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
     }
 
     public void testTermsQuery() {
-        MappedFieldType ft = createFieldType();
+        MappedFieldType ft = createFieldType(true);
         List<BytesRef> terms = new ArrayList<>();
         terms.add(new BytesRef("foo"));
         terms.add(new BytesRef("bar"));
         assertEquals(new TermInSetQuery("field", terms), ft.termsQuery(Arrays.asList("foo", "bar"), null));
 
-        MappedFieldType unsearchable = new TextFieldType("field", false, false, Collections.emptyMap());
+        MappedFieldType unsearchable = createFieldType(false);
         IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
             () -> unsearchable.termsQuery(Arrays.asList("foo", "bar"), null)
@@ -103,7 +107,7 @@ public void testTermsQuery() {
     }
 
     public void testRangeQuery() {
-        MappedFieldType ft = createFieldType();
+        MappedFieldType ft = createFieldType(true);
         assertEquals(
             new TermRangeQuery("field", BytesRefs.toBytesRef("foo"), BytesRefs.toBytesRef("bar"), true, false),
             ft.rangeQuery("foo", "bar", true, false, null, null, null, MOCK_QSC)
@@ -120,13 +124,13 @@ public void testRangeQuery() {
     }
 
     public void testRegexpQuery() {
-        MappedFieldType ft = createFieldType();
+        MappedFieldType ft = createFieldType(true);
         assertEquals(
             new RegexpQuery(new Term("field", "foo.*")),
             ft.regexpQuery("foo.*", 0, 0, 10, CONSTANT_SCORE_BLENDED_REWRITE, MOCK_QSC)
         );
 
-        MappedFieldType unsearchable = new TextFieldType("field", false, false, Collections.emptyMap());
+        MappedFieldType unsearchable = createFieldType(false);
         IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
             () -> unsearchable.regexpQuery("foo.*", 0, 0, 10, null, MOCK_QSC)
@@ -141,13 +145,13 @@ public void testRegexpQuery() {
     }
 
     public void testFuzzyQuery() {
-        MappedFieldType ft = createFieldType();
+        MappedFieldType ft = createFieldType(true);
         assertEquals(
             new FuzzyQuery(new Term("field", "foo"), 2, 1, 50, true),
             ft.fuzzyQuery("foo", Fuzziness.fromEdits(2), 1, 50, true, MOCK_QSC)
         );
 
-        MappedFieldType unsearchable = new TextFieldType("field", false, false, Collections.emptyMap());
+        MappedFieldType unsearchable = createFieldType(false);
         IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
             () -> unsearchable.fuzzyQuery("foo", Fuzziness.fromEdits(2), 1, 50, true, MOCK_QSC)
@@ -162,7 +166,7 @@ public void testFuzzyQuery() {
     }
 
     public void testIndexPrefixes() {
-        TextFieldType ft = createFieldType();
+        TextFieldType ft = createFieldType(true);
         ft.setPrefixFieldType(new TextFieldMapper.PrefixFieldType(ft, "field._index_prefix", 2, 10));
 
         Query q = ft.prefixQuery("goin", CONSTANT_SCORE_REWRITE, false, randomMockShardContext());
@@ -222,7 +226,7 @@ public void testIndexPrefixes() {
     }
 
     public void testFetchSourceValue() throws IOException {
-        TextFieldType fieldType = createFieldType();
+        TextFieldType fieldType = createFieldType(true);
         fieldType.setIndexAnalyzer(Lucene.STANDARD_ANALYZER);
 
         assertEquals(List.of("value"), fetchSourceValue(fieldType, "value"));
diff --git a/server/src/test/java/org/opensearch/index/query/SourceFieldMatchQueryTests.java b/server/src/test/java/org/opensearch/index/query/SourceFieldMatchQueryTests.java
new file mode 100644
index 0000000000000..6af717a97b328
--- /dev/null
+++ b/server/src/test/java/org/opensearch/index/query/SourceFieldMatchQueryTests.java
@@ -0,0 +1,173 @@
+/*
+ * 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.query;
+
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.Directory;
+import org.opensearch.core.index.Index;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.MapperServiceTestCase;
+import org.opensearch.index.mapper.ParsedDocument;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import static org.mockito.Mockito.when;
+
+public class SourceFieldMatchQueryTests extends MapperServiceTestCase {
+
+    public void testAllPossibleScenarios() throws IOException {
+        MapperService mapperService = createMapperService(mapping(b -> {
+            b.startObject("dessert");
+            {
+                b.field("type", "match_only_text");
+            }
+            b.endObject();
+        }));
+
+        QueryShardContext queryShardContext = createQueryShardContext(mapperService);
+        when(queryShardContext.sourcePath("dessert")).thenReturn(Set.of("dessert"));
+        when(queryShardContext.index()).thenReturn(new Index("test_index", "uuid"));
+
+        String[] desserts = new String[] { "apple pie pie", "banana split pie", "chocolate cake" };
+        List<ParsedDocument> docs = new ArrayList<>();
+        for (String dessert : desserts) {
+            docs.add(mapperService.documentMapper().parse(source(b -> b.field("dessert", dessert))));
+        }
+        SourceFieldMatchQuery matchBoth = new SourceFieldMatchQuery(
+            QueryBuilders.matchQuery("dessert", "apple").doToQuery(queryShardContext),  // Delegate query
+            QueryBuilders.matchQuery("dessert", "pie").doToQuery(queryShardContext),    // Filter query
+            queryShardContext.getFieldType("dessert"),
+            queryShardContext
+        );
+
+        SourceFieldMatchQuery matchDelegate = new SourceFieldMatchQuery(
+            QueryBuilders.matchQuery("dessert", "apple").doToQuery(queryShardContext),  // Delegate query
+            QueryBuilders.matchQuery("dessert", "juice").doToQuery(queryShardContext),    // Filter query
+            queryShardContext.getFieldType("dessert"),
+            queryShardContext
+        );
+
+        SourceFieldMatchQuery matchFilter = new SourceFieldMatchQuery(
+            QueryBuilders.matchQuery("dessert", "tart").doToQuery(queryShardContext),  // Delegate query
+            QueryBuilders.matchQuery("dessert", "pie").doToQuery(queryShardContext),    // Filter query
+            queryShardContext.getFieldType("dessert"),
+            queryShardContext
+        );
+
+        SourceFieldMatchQuery matchNone = new SourceFieldMatchQuery(
+            QueryBuilders.matchQuery("dessert", "gulab").doToQuery(queryShardContext),  // Delegate query
+            QueryBuilders.matchQuery("dessert", "jamun").doToQuery(queryShardContext),    // Filter query
+            queryShardContext.getFieldType("dessert"),
+            queryShardContext
+        );
+
+        SourceFieldMatchQuery matchMultipleDocs = new SourceFieldMatchQuery(
+            QueryBuilders.matchAllQuery().toQuery(queryShardContext),  // Delegate query
+            QueryBuilders.matchQuery("dessert", "pie").doToQuery(queryShardContext),    // Filter query
+            queryShardContext.getFieldType("dessert"),
+            queryShardContext
+        );
+        try (Directory dir = newDirectory()) {
+            IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(mapperService.indexAnalyzer()));
+            for (ParsedDocument d : docs) {
+                iw.addDocument(d.rootDoc());
+            }
+            try (IndexReader reader = DirectoryReader.open(iw)) {
+                iw.close();
+                IndexSearcher searcher = new IndexSearcher(reader);
+                TopDocs topDocs = searcher.search(matchBoth, 10);
+                assertEquals(topDocs.totalHits.value, 1);
+                assertEquals(topDocs.scoreDocs[0].doc, 0);
+
+                topDocs = searcher.search(matchDelegate, 10);
+                assertEquals(topDocs.totalHits.value, 0);
+
+                topDocs = searcher.search(matchFilter, 10);
+                assertEquals(topDocs.totalHits.value, 0);
+
+                topDocs = searcher.search(matchNone, 10);
+                assertEquals(topDocs.totalHits.value, 0);
+
+                topDocs = searcher.search(matchMultipleDocs, 10);
+                assertEquals(topDocs.totalHits.value, 2);
+                // assert constant score
+                for (ScoreDoc scoreDoc : topDocs.scoreDocs) {
+                    assertEquals(scoreDoc.score, 1.0, 0.00000000001);
+                }
+            }
+        }
+    }
+
+    public void testSourceDisabled() throws IOException {
+        MapperService mapperService = createMapperService(topMapping(b -> b.startObject("_source").field("enabled", false).endObject()));
+        QueryShardContext queryShardContext = createQueryShardContext(mapperService);
+        when(queryShardContext.sourcePath("dessert")).thenReturn(Set.of("dessert"));
+        when(queryShardContext.index()).thenReturn(new Index("test_index", "uuid"));
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
+            () -> new SourceFieldMatchQuery(
+                QueryBuilders.matchQuery("dessert", "apple").doToQuery(queryShardContext),  // Delegate query
+                QueryBuilders.matchQuery("dessert", "pie").doToQuery(queryShardContext),    // Filter query
+                queryShardContext.getFieldType("dessert"),
+                queryShardContext
+            )
+        );
+        assertEquals(
+            "SourceFieldMatchQuery error: unable to fetch fields from _source field: "
+                + "_source is disabled in the mappings for index [test_index]",
+            e.getMessage()
+        );
+    }
+
+    public void testMissingField() throws IOException {
+        MapperService mapperService = createMapperService(mapping(b -> {
+            b.startObject("dessert");
+            {
+                b.field("type", "match_only_text");
+            }
+            b.endObject();
+        }));
+        QueryShardContext queryShardContext = createQueryShardContext(mapperService);
+        when(queryShardContext.sourcePath("dessert")).thenReturn(Set.of("dessert"));
+        when(queryShardContext.index()).thenReturn(new Index("test_index", "uuid"));
+
+        String[] desserts = new String[] { "apple pie pie", "banana split pie", "chocolate cake" };
+        List<ParsedDocument> docs = new ArrayList<>();
+        for (String dessert : desserts) {
+            docs.add(mapperService.documentMapper().parse(source(b -> b.field("dessert", dessert))));
+        }
+        SourceFieldMatchQuery matchDelegate = new SourceFieldMatchQuery(
+            QueryBuilders.matchQuery("dessert", "apple").doToQuery(queryShardContext),  // Delegate query
+            QueryBuilders.matchQuery("username", "pie").doToQuery(queryShardContext),    // Filter query missing field
+            queryShardContext.getFieldType("dessert"),
+            queryShardContext
+        );
+        try (Directory dir = newDirectory()) {
+            IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(mapperService.indexAnalyzer()));
+            for (ParsedDocument d : docs) {
+                iw.addDocument(d.rootDoc());
+            }
+            try (IndexReader reader = DirectoryReader.open(iw)) {
+                iw.close();
+                IndexSearcher searcher = new IndexSearcher(reader);
+                TopDocs topDocs = searcher.search(matchDelegate, 10);
+                assertEquals(topDocs.totalHits.value, 0);
+            }
+        }
+    }
+}
diff --git a/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java b/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java
index dc2111fdcfc56..46be10ce62840 100644
--- a/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java
@@ -1416,7 +1416,7 @@ public void testRestoreLocalHistoryFromTranslogOnPromotion() throws IOException,
             indexShard,
             indexShard.getPendingPrimaryTerm() + 1,
             globalCheckpoint,
-            randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, maxSeqNo),
+            randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, maxSeqNoOfUpdatesOrDeletesBeforeRollback),
             new ActionListener<Releasable>() {
                 @Override
                 public void onResponse(Releasable releasable) {
diff --git a/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java b/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
index 36cfd84ff960a..2c6c4afed69fd 100644
--- a/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
+++ b/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
@@ -51,6 +51,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -122,6 +123,14 @@ public class RemoteSegmentStoreDirectoryTests extends IndexShardTestCase {
         1,
         "node-1"
     );
+    private final String metadataFilename4 = RemoteSegmentStoreDirectory.MetadataFilenameUtils.getMetadataFilename(
+        10,
+        36,
+        34,
+        1,
+        1,
+        "node-1"
+    );
 
     @Before
     public void setup() throws IOException {
@@ -979,6 +988,51 @@ public void testDeleteStaleCommitsActualDelete() throws Exception {
         verify(remoteMetadataDirectory).deleteFile(metadataFilename3);
     }
 
+    public void testDeleteStaleCommitsDeleteDedup() throws Exception {
+        Map<String, Map<String, String>> metadataFilenameContentMapping = new HashMap<>(populateMetadata());
+        metadataFilenameContentMapping.put(metadataFilename4, metadataFilenameContentMapping.get(metadataFilename3));
+
+        when(
+            remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(
+                RemoteSegmentStoreDirectory.MetadataFilenameUtils.METADATA_PREFIX,
+                Integer.MAX_VALUE
+            )
+        ).thenReturn(new ArrayList<>(List.of(metadataFilename, metadataFilename2, metadataFilename3, metadataFilename4)));
+
+        when(remoteMetadataDirectory.getBlobStream(metadataFilename4)).thenAnswer(
+            I -> createMetadataFileBytes(
+                metadataFilenameContentMapping.get(metadataFilename4),
+                indexShard.getLatestReplicationCheckpoint(),
+                segmentInfos
+            )
+        );
+
+        remoteSegmentStoreDirectory.init();
+
+        // popluateMetadata() adds stub to return 4 metadata files
+        // We are passing lastNMetadataFilesToKeep=2 here so that oldest 2 metadata files will be deleted
+        remoteSegmentStoreDirectory.deleteStaleSegmentsAsync(2);
+
+        Set<String> staleSegmentFiles = new HashSet<>();
+        for (String metadata : metadataFilenameContentMapping.get(metadataFilename3).values()) {
+            staleSegmentFiles.add(metadata.split(RemoteSegmentStoreDirectory.UploadedSegmentMetadata.SEPARATOR)[1]);
+        }
+        for (String metadata : metadataFilenameContentMapping.get(metadataFilename4).values()) {
+            staleSegmentFiles.add(metadata.split(RemoteSegmentStoreDirectory.UploadedSegmentMetadata.SEPARATOR)[1]);
+        }
+        staleSegmentFiles.forEach(file -> {
+            try {
+                // Even with the same files in 2 stale metadata files, delete should be called only once.
+                verify(remoteDataDirectory, times(1)).deleteFile(file);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        assertBusy(() -> assertThat(remoteSegmentStoreDirectory.canDeleteStaleCommits.get(), is(true)));
+        verify(remoteMetadataDirectory).deleteFile(metadataFilename3);
+        verify(remoteMetadataDirectory).deleteFile(metadataFilename4);
+    }
+
     public void testDeleteStaleCommitsActualDeleteIOException() throws Exception {
         Map<String, Map<String, String>> metadataFilenameContentMapping = populateMetadata();
         remoteSegmentStoreDirectory.init();
diff --git a/server/src/test/java/org/opensearch/indices/store/ShardAttributesTests.java b/server/src/test/java/org/opensearch/indices/store/ShardAttributesTests.java
new file mode 100644
index 0000000000000..7fa95fefe72fd
--- /dev/null
+++ b/server/src/test/java/org/opensearch/indices/store/ShardAttributesTests.java
@@ -0,0 +1,49 @@
+/*
+ * 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.indices.store;
+
+import org.opensearch.core.common.io.stream.DataOutputStreamOutput;
+import org.opensearch.core.common.io.stream.InputStreamStreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.index.Index;
+import org.opensearch.core.index.shard.ShardId;
+import org.opensearch.test.OpenSearchTestCase;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class ShardAttributesTests extends OpenSearchTestCase {
+
+    Index index = new Index("index", "test-uid");
+    ShardId shardId = new ShardId(index, 0);
+    String customDataPath = "/path/to/data";
+
+    public void testShardAttributesConstructor() {
+        ShardAttributes attributes = new ShardAttributes(shardId, customDataPath);
+        assertEquals(attributes.getShardId(), shardId);
+        assertEquals(attributes.getCustomDataPath(), customDataPath);
+    }
+
+    public void testSerialization() throws IOException {
+        ShardAttributes attributes1 = new ShardAttributes(shardId, customDataPath);
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        StreamOutput output = new DataOutputStreamOutput(new DataOutputStream(bytes));
+        attributes1.writeTo(output);
+        output.close();
+        StreamInput input = new InputStreamStreamInput(new ByteArrayInputStream(bytes.toByteArray()));
+        ShardAttributes attributes2 = new ShardAttributes(input);
+        input.close();
+        assertEquals(attributes1.getShardId(), attributes2.getShardId());
+        assertEquals(attributes1.getCustomDataPath(), attributes2.getCustomDataPath());
+    }
+
+}
diff --git a/server/src/test/java/org/opensearch/search/pipeline/SearchPipelineServiceTests.java b/server/src/test/java/org/opensearch/search/pipeline/SearchPipelineServiceTests.java
index 98d2a7e84d672..f5851e669a2da 100644
--- a/server/src/test/java/org/opensearch/search/pipeline/SearchPipelineServiceTests.java
+++ b/server/src/test/java/org/opensearch/search/pipeline/SearchPipelineServiceTests.java
@@ -41,6 +41,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.AtomicArray;
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
+import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.breaker.CircuitBreaker;
 import org.opensearch.core.common.breaker.NoopCircuitBreaker;
@@ -68,6 +69,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
 import static org.mockito.ArgumentMatchers.anyString;
@@ -1378,4 +1380,92 @@ public void testExtraParameterInProcessorConfig() {
             fail("Wrong exception type: " + e.getClass());
         }
     }
+
+    private static class FakeStatefulRequestProcessor extends AbstractProcessor implements StatefulSearchRequestProcessor {
+        private final String type;
+        private final Consumer<PipelineProcessingContext> stateConsumer;
+
+        public FakeStatefulRequestProcessor(String type, Consumer<PipelineProcessingContext> stateConsumer) {
+            super(null, null, false);
+            this.type = type;
+            this.stateConsumer = stateConsumer;
+        }
+
+        @Override
+        public String getType() {
+            return type;
+        }
+
+        @Override
+        public SearchRequest processRequest(SearchRequest request, PipelineProcessingContext requestContext) throws Exception {
+            stateConsumer.accept(requestContext);
+            return request;
+        }
+    }
+
+    private static class FakeStatefulResponseProcessor extends AbstractProcessor implements StatefulSearchResponseProcessor {
+        private final String type;
+        private final Consumer<PipelineProcessingContext> stateConsumer;
+
+        public FakeStatefulResponseProcessor(String type, Consumer<PipelineProcessingContext> stateConsumer) {
+            super(null, null, false);
+            this.type = type;
+            this.stateConsumer = stateConsumer;
+        }
+
+        @Override
+        public String getType() {
+            return type;
+        }
+
+        @Override
+        public SearchResponse processResponse(SearchRequest request, SearchResponse response, PipelineProcessingContext requestContext)
+            throws Exception {
+            stateConsumer.accept(requestContext);
+            return response;
+        }
+    }
+
+    public void testStatefulProcessors() throws Exception {
+        AtomicReference<String> contextHolder = new AtomicReference<>();
+        SearchPipelineService searchPipelineService = createWithProcessors(
+            Map.of(
+                "write_context",
+                (pf, t, d, igf, cfg, ctx) -> new FakeStatefulRequestProcessor("write_context", (c) -> c.setAttribute("a", "b"))
+            ),
+            Map.of(
+                "read_context",
+                (pf, t, d, igf, cfg, ctx) -> new FakeStatefulResponseProcessor(
+                    "read_context",
+                    (c) -> contextHolder.set((String) c.getAttribute("a"))
+                )
+            ),
+            Collections.emptyMap()
+        );
+
+        SearchPipelineMetadata metadata = new SearchPipelineMetadata(
+            Map.of(
+                "p1",
+                new PipelineConfiguration(
+                    "p1",
+                    new BytesArray(
+                        "{\"request_processors\" : [ { \"write_context\": {} } ], \"response_processors\": [ { \"read_context\": {} }] }"
+                    ),
+                    XContentType.JSON
+                )
+            )
+        );
+        ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build();
+        ClusterState previousState = clusterState;
+        clusterState = ClusterState.builder(clusterState)
+            .metadata(Metadata.builder().putCustom(SearchPipelineMetadata.TYPE, metadata))
+            .build();
+        searchPipelineService.applyClusterState(new ClusterChangedEvent("", clusterState, previousState));
+
+        PipelinedRequest request = searchPipelineService.resolvePipeline(new SearchRequest().pipeline("p1"));
+        assertNull(contextHolder.get());
+        syncExecutePipeline(request, new SearchResponse(null, null, 0, 0, 0, 0, null, null));
+        assertNotNull(contextHolder.get());
+        assertEquals("b", contextHolder.get());
+    }
 }
diff --git a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
index 62dcf54e25578..48ac2d3b5a804 100644
--- a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
+++ b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
@@ -615,12 +615,22 @@ public void testTerminateAfterEarlyTermination() throws Exception {
                 assertThat(query.getTimeBreakdown().get("score"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("score_count"), greaterThan(0L));
                 if (executor != null) {
-                    assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThan(0L));
-                    assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
+                    long maxScore = query.getTimeBreakdown().get("max_score");
+                    long minScore = query.getTimeBreakdown().get("min_score");
+                    long avgScore = query.getTimeBreakdown().get("avg_score");
+                    long maxScoreCount = query.getTimeBreakdown().get("max_score_count");
+                    long minScoreCount = query.getTimeBreakdown().get("min_score_count");
+                    long avgScoreCount = query.getTimeBreakdown().get("avg_score_count");
+                    assertThat(maxScore, greaterThan(0L));
+                    assertThat(minScore, greaterThanOrEqualTo(0L));
+                    assertThat(avgScore, greaterThanOrEqualTo(0L));
+                    assertThat(maxScore, greaterThanOrEqualTo(avgScore));
+                    assertThat(avgScore, greaterThanOrEqualTo(minScore));
+                    assertThat(maxScoreCount, greaterThan(0L));
+                    assertThat(minScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
                 }
                 assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));
@@ -744,30 +754,50 @@ public void testTerminateAfterEarlyTermination() throws Exception {
                 assertThat(query.getProfiledChildren().get(0).getTime(), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
-                assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score"), greaterThan(0L));
-                assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score_count"), greaterThan(0L));
+                assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score"), greaterThanOrEqualTo(0L));
+                assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(0L));
                 if (executor != null) {
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score_count"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score_count"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
+                    long maxScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score");
+                    long minScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score");
+                    long avgScore = query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score");
+                    long maxScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("max_score_count");
+                    long minScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("min_score_count");
+                    long avgScoreCount = query.getProfiledChildren().get(0).getTimeBreakdown().get("avg_score_count");
+                    assertThat(maxScore, greaterThanOrEqualTo(0L));
+                    assertThat(minScore, greaterThanOrEqualTo(0L));
+                    assertThat(avgScore, greaterThanOrEqualTo(0L));
+                    assertThat(maxScore, greaterThanOrEqualTo(avgScore));
+                    assertThat(avgScore, greaterThanOrEqualTo(minScore));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(minScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
                 }
 
                 assertThat(query.getProfiledChildren().get(1).getQueryName(), equalTo("TermQuery"));
                 assertThat(query.getProfiledChildren().get(1).getTime(), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
-                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score"), greaterThan(0L));
-                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score_count"), greaterThan(0L));
+                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score"), greaterThanOrEqualTo(0L));
+                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(0L));
                 if (executor != null) {
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score_count"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score_count"), greaterThan(0L));
-                    assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score_count"), greaterThan(0L));
+                    long maxScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score");
+                    long minScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score");
+                    long avgScore = query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score");
+                    long maxScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("max_score_count");
+                    long minScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("min_score_count");
+                    long avgScoreCount = query.getProfiledChildren().get(1).getTimeBreakdown().get("avg_score_count");
+                    assertThat(maxScore, greaterThanOrEqualTo(0L));
+                    assertThat(minScore, greaterThanOrEqualTo(0L));
+                    assertThat(avgScore, greaterThanOrEqualTo(0L));
+                    assertThat(maxScore, greaterThanOrEqualTo(avgScore));
+                    assertThat(avgScore, greaterThanOrEqualTo(minScore));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(minScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(0L));
+                    assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
+                    assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
                 }
             }, collector -> {
                 assertThat(collector.getReason(), equalTo("search_terminate_after_count"));
@@ -1401,12 +1431,22 @@ public void testCollapseQuerySearchResults() throws Exception {
             assertThat(query.getTimeBreakdown().get("score"), greaterThan(0L));
             assertThat(query.getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(6L));
             if (executor != null) {
-                assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
-                assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
-                assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThanOrEqualTo(6L));
-                assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(2L));
-                assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThanOrEqualTo(6L));
+                long maxScore = query.getTimeBreakdown().get("max_score");
+                long minScore = query.getTimeBreakdown().get("min_score");
+                long avgScore = query.getTimeBreakdown().get("avg_score");
+                long maxScoreCount = query.getTimeBreakdown().get("max_score_count");
+                long minScoreCount = query.getTimeBreakdown().get("min_score_count");
+                long avgScoreCount = query.getTimeBreakdown().get("avg_score_count");
+                assertThat(maxScore, greaterThan(0L));
+                assertThat(minScore, greaterThan(0L));
+                assertThat(avgScore, greaterThan(0L));
+                assertThat(maxScore, greaterThanOrEqualTo(avgScore));
+                assertThat(avgScore, greaterThanOrEqualTo(minScore));
+                assertThat(maxScoreCount, greaterThan(0L));
+                assertThat(minScoreCount, greaterThan(0L));
+                assertThat(avgScoreCount, greaterThan(0L));
+                assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
+                assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
             }
             assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
             assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));
@@ -1436,12 +1476,22 @@ public void testCollapseQuerySearchResults() throws Exception {
             assertThat(query.getTimeBreakdown().get("score"), greaterThan(0L));
             assertThat(query.getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(6L));
             if (executor != null) {
-                assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L));
-                assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L));
-                assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L));
-                assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThanOrEqualTo(6L));
-                assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(2L));
-                assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThanOrEqualTo(6L));
+                long maxScore = query.getTimeBreakdown().get("max_score");
+                long minScore = query.getTimeBreakdown().get("min_score");
+                long avgScore = query.getTimeBreakdown().get("avg_score");
+                long maxScoreCount = query.getTimeBreakdown().get("max_score_count");
+                long minScoreCount = query.getTimeBreakdown().get("min_score_count");
+                long avgScoreCount = query.getTimeBreakdown().get("avg_score_count");
+                assertThat(maxScore, greaterThan(0L));
+                assertThat(minScore, greaterThan(0L));
+                assertThat(avgScore, greaterThan(0L));
+                assertThat(maxScore, greaterThanOrEqualTo(avgScore));
+                assertThat(avgScore, greaterThanOrEqualTo(minScore));
+                assertThat(maxScoreCount, greaterThan(0L));
+                assertThat(minScoreCount, greaterThan(0L));
+                assertThat(avgScoreCount, greaterThan(0L));
+                assertThat(maxScoreCount, greaterThanOrEqualTo(avgScoreCount));
+                assertThat(avgScoreCount, greaterThanOrEqualTo(minScoreCount));
             }
             assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
             assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));
diff --git a/server/src/test/java/org/opensearch/telemetry/tracing/ThreadContextBasedTracerContextStorageTests.java b/server/src/test/java/org/opensearch/telemetry/tracing/ThreadContextBasedTracerContextStorageTests.java
index 3a98a67b53920..ee816aa5f596d 100644
--- a/server/src/test/java/org/opensearch/telemetry/tracing/ThreadContextBasedTracerContextStorageTests.java
+++ b/server/src/test/java/org/opensearch/telemetry/tracing/ThreadContextBasedTracerContextStorageTests.java
@@ -145,6 +145,87 @@ public void run() {
         assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(nullValue()));
     }
 
+    public void testNoThreadContextToPreserve() throws InterruptedException, ExecutionException, TimeoutException {
+        final Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                assertThat(threadContext.getTransient(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(nullValue()));
+                assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(nullValue()));
+
+                final Span local1 = tracer.startSpan(SpanCreationContext.internal().name("test-local-1"));
+                try (SpanScope localScope = tracer.withSpanInScope(local1)) {
+                    try (StoredContext ignored = threadContext.stashContext()) {
+                        assertThat(local1.getParentSpan(), is(nullValue()));
+                        assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(local1));
+                    }
+                }
+
+                final Span local2 = tracer.startSpan(SpanCreationContext.internal().name("test-local-2"));
+                try (SpanScope localScope = tracer.withSpanInScope(local2)) {
+                    try (StoredContext ignored = threadContext.stashContext()) {
+                        assertThat(local2.getParentSpan(), is(nullValue()));
+                        assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(local2));
+                    }
+                }
+
+                final Span local3 = tracer.startSpan(SpanCreationContext.internal().name("test-local-3"));
+                try (SpanScope localScope = tracer.withSpanInScope(local3)) {
+                    try (StoredContext ignored = threadContext.stashContext()) {
+                        assertThat(local3.getParentSpan(), is(nullValue()));
+                        assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(local3));
+                    }
+                }
+            }
+        };
+
+        executorService.submit(threadContext.preserveContext(r)).get(1, TimeUnit.SECONDS);
+
+        assertThat(threadContext.getTransient(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(nullValue()));
+    }
+
+    public void testPreservingContextThreadContextMultipleSpans() throws InterruptedException, ExecutionException, TimeoutException {
+        final Span span = tracer.startSpan(SpanCreationContext.internal().name("test"));
+
+        try (SpanScope scope = tracer.withSpanInScope(span)) {
+            final Runnable r = new Runnable() {
+                @Override
+                public void run() {
+                    assertThat(threadContext.getTransient(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(not(nullValue())));
+                    assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(span));
+
+                    final Span local1 = tracer.startSpan(SpanCreationContext.internal().name("test-local-1"));
+                    try (SpanScope localScope = tracer.withSpanInScope(local1)) {
+                        try (StoredContext ignored = threadContext.stashContext()) {
+                            assertThat(local1.getParentSpan(), is(span));
+                            assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(local1));
+                        }
+                    }
+
+                    final Span local2 = tracer.startSpan(SpanCreationContext.internal().name("test-local-2"));
+                    try (SpanScope localScope = tracer.withSpanInScope(local2)) {
+                        try (StoredContext ignored = threadContext.stashContext()) {
+                            assertThat(local2.getParentSpan(), is(span));
+                            assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(local2));
+                        }
+                    }
+
+                    final Span local3 = tracer.startSpan(SpanCreationContext.internal().name("test-local-3"));
+                    try (SpanScope localScope = tracer.withSpanInScope(local3)) {
+                        try (StoredContext ignored = threadContext.stashContext()) {
+                            assertThat(local3.getParentSpan(), is(span));
+                            assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(local3));
+                        }
+                    }
+                }
+            };
+
+            executorService.submit(threadContext.preserveContext(r)).get(1, TimeUnit.SECONDS);
+        }
+
+        assertThat(threadContext.getTransient(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(not(nullValue())));
+        assertThat(threadContextStorage.get(ThreadContextBasedTracerContextStorage.CURRENT_SPAN), is(nullValue()));
+    }
+
     public void testPreservingContextAndStashingThreadContext() throws InterruptedException, ExecutionException, TimeoutException {
         final Span span = tracer.startSpan(SpanCreationContext.internal().name("test"));
 
diff --git a/server/src/test/java/org/opensearch/threadpool/ScalingThreadPoolTests.java b/server/src/test/java/org/opensearch/threadpool/ScalingThreadPoolTests.java
index 19271bbf30e80..97326377ce245 100644
--- a/server/src/test/java/org/opensearch/threadpool/ScalingThreadPoolTests.java
+++ b/server/src/test/java/org/opensearch/threadpool/ScalingThreadPoolTests.java
@@ -150,10 +150,10 @@ private int expectedSize(final String threadPoolName, final int numberOfProcesso
         sizes.put(ThreadPool.Names.SNAPSHOT, ThreadPool::halfAllocatedProcessorsMaxFive);
         sizes.put(ThreadPool.Names.FETCH_SHARD_STARTED, ThreadPool::twiceAllocatedProcessors);
         sizes.put(ThreadPool.Names.FETCH_SHARD_STORE, ThreadPool::twiceAllocatedProcessors);
-        sizes.put(ThreadPool.Names.TRANSLOG_TRANSFER, ThreadPool::halfAllocatedProcessorsMaxTen);
+        sizes.put(ThreadPool.Names.TRANSLOG_TRANSFER, ThreadPool::halfAllocatedProcessors);
         sizes.put(ThreadPool.Names.TRANSLOG_SYNC, n -> 4 * n);
-        sizes.put(ThreadPool.Names.REMOTE_PURGE, ThreadPool::halfAllocatedProcessorsMaxFive);
-        sizes.put(ThreadPool.Names.REMOTE_REFRESH_RETRY, ThreadPool::halfAllocatedProcessorsMaxTen);
+        sizes.put(ThreadPool.Names.REMOTE_PURGE, ThreadPool::halfAllocatedProcessors);
+        sizes.put(ThreadPool.Names.REMOTE_REFRESH_RETRY, ThreadPool::halfAllocatedProcessors);
         sizes.put(ThreadPool.Names.REMOTE_RECOVERY, ThreadPool::twiceAllocatedProcessors);
         return sizes.get(threadPoolName).apply(numberOfProcessors);
     }
diff --git a/settings.gradle b/settings.gradle
index 139d45013710f..24ab4a7a22237 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@
  */
 
 plugins {
-  id "com.gradle.enterprise" version "3.15.1"
+  id "com.gradle.enterprise" version "3.16.1"
 }
 
 ext.disableBuildCache = hasProperty('DISABLE_BUILD_CACHE') || System.getenv().containsKey('DISABLE_BUILD_CACHE')
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
index ea677de632254..7adf29792f27d 100644
--- a/test/fixtures/hdfs-fixture/build.gradle
+++ b/test/fixtures/hdfs-fixture/build.gradle
@@ -33,7 +33,7 @@ apply plugin: 'opensearch.java'
 group = 'hdfs'
 
 versions << [
-  'jetty': '9.4.52.v20230823'
+  'jetty': '9.4.53.v20231009'
 ]
 
 dependencies {
@@ -48,6 +48,9 @@ dependencies {
     exclude group: "com.squareup.okhttp3"
     exclude group: "org.xerial.snappy"
     exclude module: "json-io"
+    exclude module: "logback-core"
+    exclude module: "logback-classic"
+    exclude module: "avro"
   }
   api "org.codehaus.jettison:jettison:${versions.jettison}"
   api "org.apache.commons:commons-compress:${versions.commonscompress}"
@@ -66,11 +69,13 @@ dependencies {
   api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jetty}"
   api 'org.apache.zookeeper:zookeeper:3.9.1'
   api "org.apache.commons:commons-text:1.11.0"
-  api "commons-net:commons-net:3.9.0"
+  api "commons-net:commons-net:3.10.0"
+  api "ch.qos.logback:logback-core:1.2.13"
+  api "ch.qos.logback:logback-classic:1.2.13"
   runtimeOnly "com.google.guava:guava:${versions.guava}"
   runtimeOnly("com.squareup.okhttp3:okhttp:4.12.0") {
     exclude group: "com.squareup.okio"
   }
-  runtimeOnly "com.squareup.okio:okio:3.6.0"
+  runtimeOnly "com.squareup.okio:okio:3.7.0"
   runtimeOnly "org.xerial.snappy:snappy-java:1.1.10.5"
 }
diff --git a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java
index 8f065de35aa8b..43881d0660e04 100644
--- a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java
+++ b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java
@@ -69,6 +69,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -161,12 +162,17 @@ public class BootstrapForTesting {
                     addClassCodebase(codebases, "opensearch-rest-client", "org.opensearch.client.RestClient");
                 }
                 final Policy testFramework = Security.readPolicy(Bootstrap.class.getResource("test-framework.policy"), codebases);
+                // Allow modules to define own test policy in ad-hoc fashion (if needed) that is not really applicable to other modules
+                final Optional<Policy> testPolicy = Optional.ofNullable(Bootstrap.class.getResource("test.policy"))
+                    .map(policy -> Security.readPolicy(policy, codebases));
                 final Policy opensearchPolicy = new OpenSearchPolicy(codebases, perms, getPluginPermissions(), true, new Permissions());
                 Policy.setPolicy(new Policy() {
                     @Override
                     public boolean implies(ProtectionDomain domain, Permission permission) {
                         // implements union
-                        return opensearchPolicy.implies(domain, permission) || testFramework.implies(domain, permission);
+                        return opensearchPolicy.implies(domain, permission)
+                            || testFramework.implies(domain, permission)
+                            || testPolicy.map(policy -> policy.implies(domain, permission)).orElse(false /* no policy */);
                     }
                 });
                 // Create access control context for mocking
diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java
index 94c2e4ef7da62..ac78a0d1936ea 100644
--- a/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java
@@ -239,7 +239,7 @@ protected final XContentBuilder fieldMapping(CheckedConsumer<XContentBuilder, IO
         });
     }
 
-    QueryShardContext createQueryShardContext(MapperService mapperService) {
+    protected QueryShardContext createQueryShardContext(MapperService mapperService) {
         QueryShardContext queryShardContext = mock(QueryShardContext.class);
         when(queryShardContext.getMapperService()).thenReturn(mapperService);
         when(queryShardContext.fieldMapper(anyString())).thenAnswer(inv -> mapperService.fieldType(inv.getArguments()[0].toString()));
@@ -254,6 +254,8 @@ QueryShardContext createQueryShardContext(MapperService mapperService) {
         when(queryShardContext.lookup()).thenReturn(new SearchLookup(mapperService, (ft, s) -> {
             throw new UnsupportedOperationException("search lookup not available");
         }));
+        when(queryShardContext.getFieldType(any())).thenAnswer(inv -> mapperService.fieldType(inv.getArguments()[0].toString()));
+        when(queryShardContext.documentMapper(anyString())).thenReturn(mapperService.documentMapper());
         return queryShardContext;
     }
 }
diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
index 82f15a590bea6..ac0447dbebf7e 100644
--- a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
@@ -103,6 +103,7 @@
 import org.opensearch.index.mapper.Mapper;
 import org.opensearch.index.mapper.Mapper.BuilderContext;
 import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.MatchOnlyTextFieldMapper;
 import org.opensearch.index.mapper.NumberFieldMapper;
 import org.opensearch.index.mapper.ObjectMapper;
 import org.opensearch.index.mapper.ObjectMapper.Nested;
@@ -760,7 +761,8 @@ public void testSupportedFieldTypes() throws IOException {
             source.put("type", mappedType.getKey());
 
             // Text is the only field that doesn't support DVs, instead FD
-            if (mappedType.getKey().equals(TextFieldMapper.CONTENT_TYPE) == false) {
+            if (mappedType.getKey().equals(TextFieldMapper.CONTENT_TYPE) == false
+                && mappedType.getKey().equals(MatchOnlyTextFieldMapper.CONTENT_TYPE) == false) {
                 source.put("doc_values", "true");
             }
 
diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
index 7614cd0e8f920..6215e84f42676 100644
--- a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
@@ -71,6 +71,7 @@
 import org.opensearch.action.search.ClearScrollResponse;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.support.IndicesOptions;
+import org.opensearch.action.support.WriteRequest;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.client.ClusterAdminClient;
@@ -1646,6 +1647,7 @@ public void indexRandom(boolean forceRefresh, boolean dummyDocuments, boolean ma
             for (List<IndexRequestBuilder> segmented : partition) {
                 BulkRequestBuilder bulkBuilder = client().prepareBulk();
                 for (IndexRequestBuilder indexRequestBuilder : segmented) {
+                    indexRequestBuilder.setRefreshPolicy(WriteRequest.RefreshPolicy.NONE);
                     bulkBuilder.add(indexRequestBuilder);
                 }
                 BulkResponse actionGet = bulkBuilder.execute().actionGet();
diff --git a/test/framework/src/main/java/org/opensearch/test/gateway/TestGatewayAllocator.java b/test/framework/src/main/java/org/opensearch/test/gateway/TestGatewayAllocator.java
index 7462062a0cd46..f123b926f5bad 100644
--- a/test/framework/src/main/java/org/opensearch/test/gateway/TestGatewayAllocator.java
+++ b/test/framework/src/main/java/org/opensearch/test/gateway/TestGatewayAllocator.java
@@ -98,7 +98,11 @@ protected AsyncShardFetch.FetchResult<NodeGatewayStartedShards> fetchData(ShardR
                     )
                 );
 
-            return new AsyncShardFetch.FetchResult<>(shardId, foundShards, ignoreNodes);
+            return new AsyncShardFetch.FetchResult<>(foundShards, new HashMap<>() {
+                {
+                    put(shardId, ignoreNodes);
+                }
+            });
         }
     };
 
@@ -111,7 +115,11 @@ private ReplicationCheckpoint getReplicationCheckpoint(ShardId shardId, String n
         protected AsyncShardFetch.FetchResult<NodeStoreFilesMetadata> fetchData(ShardRouting shard, RoutingAllocation allocation) {
             // for now, just pretend no node has data
             final ShardId shardId = shard.shardId();
-            return new AsyncShardFetch.FetchResult<>(shardId, Collections.emptyMap(), allocation.getIgnoreNodes(shardId));
+            return new AsyncShardFetch.FetchResult<>(Collections.emptyMap(), new HashMap<>() {
+                {
+                    put(shardId, allocation.getIgnoreNodes(shardId));
+                }
+            });
         }
 
         @Override