diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8dce60ab5ce4..f2c0229e8c7fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - GHA to verify checklist items completion in PR descriptions ([#10800](https://github.com/opensearch-project/OpenSearch/pull/10800))
 - Allow to pass the list settings through environment variables (like [], ["a", "b", "c"], ...) ([#10625](https://github.com/opensearch-project/OpenSearch/pull/10625))
 - [Admission Control] Integrate CPU AC with ResourceUsageCollector and add CPU AC stats to nodes/stats ([#10887](https://github.com/opensearch-project/OpenSearch/pull/10887))
+- [S3 Repository] Add setting to control connection count for sync client ([#12028](https://github.com/opensearch-project/OpenSearch/pull/12028))
 
 ### Dependencies
 - Bump `log4j-core` from 2.18.0 to 2.19.0
@@ -133,6 +134,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump OpenTelemetry from 1.32.0 to 1.34.1 ([#11891](https://github.com/opensearch-project/OpenSearch/pull/11891))
 - Support index level allocation filtering for searchable snapshot index ([#11563](https://github.com/opensearch-project/OpenSearch/pull/11563))
 - Add `org.opensearch.rest.MethodHandlers` and `RestController#getAllHandlers` ([11876](https://github.com/opensearch-project/OpenSearch/pull/11876))
+- New DateTime format for RFC3339 compatible date fields ([#11465](https://github.com/opensearch-project/OpenSearch/pull/11465))
 
 ### Dependencies
 - Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822))
@@ -151,12 +153,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `stefanzweifel/git-auto-commit-action` from 4 to 5 ([#11171](https://github.com/opensearch-project/OpenSearch/pull/11171))
 - Bump `actions/github-script` from 6 to 7 ([#11271](https://github.com/opensearch-project/OpenSearch/pull/11271))
 - Bump `jackson` and `jackson_databind` from 2.15.2 to 2.16.0 ([#11273](https://github.com/opensearch-project/OpenSearch/pull/11273))
-- Bump `netty` from 4.1.100.Final to 4.1.104.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294), [#11775](https://github.com/opensearch-project/OpenSearch/pull/11775))
+- Bump `netty` from 4.1.100.Final to 4.1.106.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294), [#11775](https://github.com/opensearch-project/OpenSearch/pull/11775)), [#12034](https://github.com/opensearch-project/OpenSearch/pull/12034))
 - 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.16.1 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629))
+- Bump `reactor-netty-core` from 1.1.12 to 1.1.15 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350)), ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
+- Bump `com.gradle.enterprise` from 3.14.1 to 3.16.2 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629), [#12056](https://github.com/opensearch-project/OpenSearch/pull/12056))
 - 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))
@@ -173,12 +175,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.maxmind.db:maxmind-db` from 3.0.0 to 3.1.0 ([#11693](https://github.com/opensearch-project/OpenSearch/pull/11693))
 - Bump `net.java.dev.jna:jna` from 5.13.0 to 5.14.0 ([#11798](https://github.com/opensearch-project/OpenSearch/pull/11798))
 - Bump `lycheeverse/lychee-action` from 1.8.0 to 1.9.1 ([#11795](https://github.com/opensearch-project/OpenSearch/pull/11795), [#11887](https://github.com/opensearch-project/OpenSearch/pull/11887))
-- Bump `Lucene` from 9.8.0 to 9.9.1 ([#11421](https://github.com/opensearch-project/OpenSearch/pull/11421))
+- Bump `Lucene` from 9.8.0 to 9.9.2 ([#11421](https://github.com/opensearch-project/OpenSearch/pull/11421)), ([#12063](https://github.com/opensearch-project/OpenSearch/pull/12063))
 - Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.2.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886), [#11963](https://github.com/opensearch-project/OpenSearch/pull/11963))
 - Bump `com.google.api:gax-httpjson` from 0.103.1 to 2.39.0 ([#11794](https://github.com/opensearch-project/OpenSearch/pull/11794))
 - Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
-- Bump `com.diffplug.spotless` from 6.23.2 to 6.24.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962))
+- Bump `com.diffplug.spotless` from 6.23.2 to 6.25.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962), [#12055](https://github.com/opensearch-project/OpenSearch/pull/12055))
 - Bump `com.google.cloud:google-cloud-core` from 2.5.10 to 2.30.0 ([#11961](https://github.com/opensearch-project/OpenSearch/pull/11961))
+- Bump `reactor-core` from 3.5.11 to 3.5.14 ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
+- Bump `com.google.http-client:google-http-client-jackson2` from 1.43.3 to 1.44.1 ([#12059](https://github.com/opensearch-project/OpenSearch/pull/12059))
 
 ### Changed
 - Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))
@@ -209,7 +213,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Use slice_size == shard_size heuristic in terms aggs for concurrent segment search and properly calculate the doc_count_error ([#11732](https://github.com/opensearch-project/OpenSearch/pull/11732))
 - Added Support for dynamically adding SearchRequestOperationsListeners with SearchRequestOperationsCompositeListenerFactory ([#11526](https://github.com/opensearch-project/OpenSearch/pull/11526))
 - Ensure Jackson default maximums introduced in 2.16.0 do not conflict with OpenSearch settings ([#11890](https://github.com/opensearch-project/OpenSearch/pull/11890))
-- Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877))
+- Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877)), ([#12000](https://github.com/opensearch-project/OpenSearch/pull/12000))
 - Workaround for https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in JDK-21.0.2 ([#11968](https://github.com/opensearch-project/OpenSearch/pull/11968))
 
 ### Deprecated
@@ -241,6 +245,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix tracing context propagation for local transport instrumentation ([#11490](https://github.com/opensearch-project/OpenSearch/pull/11490))
 - Fix parsing of single line comments in `lang-painless` ([#11815](https://github.com/opensearch-project/OpenSearch/issues/11815))
 - Fix memory leak issue in ReorganizingLongHash ([#11953](https://github.com/opensearch-project/OpenSearch/issues/11953))
+- Prevent setting remote_snapshot store type on index creation ([#11867](https://github.com/opensearch-project/OpenSearch/pull/11867))
+- [BUG] Fix remote shards balancer when filtering throttled nodes ([#11724](https://github.com/opensearch-project/OpenSearch/pull/11724))
 
 ### Security
 
diff --git a/NOTICE.txt b/NOTICE.txt
index 6c7dc983f8c7a..d463b8f28561f 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -10,3 +10,6 @@ Foundation (http://www.apache.org/).
 
 This product includes software developed by
 Joda.org (http://www.joda.org/).
+
+This product includes software developed by
+Morten Haraldsen (ethlo) (https://github.com/ethlo) under the Apache License, version 2.0.
diff --git a/build.gradle b/build.gradle
index 4d29ca8664af3..e082967255b10 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ plugins {
   id 'lifecycle-base'
   id 'opensearch.docker-support'
   id 'opensearch.global-build-info'
-  id "com.diffplug.spotless" version "6.24.0" apply false
+  id "com.diffplug.spotless" version "6.25.0" apply false
   id "org.gradle.test-retry" version "1.5.4" apply false
   id "test-report-aggregation"
   id 'jacoco-report-aggregation'
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 8f8e445b04437..95ae1ddb578a1 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.9.1
+lucene            = 9.9.2
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 21.0.2+13
@@ -26,12 +26,12 @@ jakarta_annotation = 1.3.5
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.13.0
 
-netty             = 4.1.104.Final
+netty             = 4.1.106.Final
 joda              = 2.12.2
 
 # project reactor
-reactor_netty     = 1.1.13
-reactor           = 3.5.11
+reactor_netty     = 1.1.15
+reactor           = 3.5.14
 
 # client dependencies
 httpclient5       = 5.2.1
@@ -55,7 +55,7 @@ bouncycastle=1.76
 randomizedrunner  = 2.7.1
 junit             = 4.13.2
 hamcrest          = 2.1
-mockito           = 5.5.0
+mockito           = 5.10.0
 objenesis         = 3.2
 bytebuddy         = 1.14.7
 
diff --git a/libs/core/licenses/lucene-core-9.9.1.jar.sha1 b/libs/core/licenses/lucene-core-9.9.1.jar.sha1
deleted file mode 100644
index ae596196d9e6a..0000000000000
--- a/libs/core/licenses/lucene-core-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55249fa9a0ed321adcf8283c6f3b649a6812b0a9
\ No newline at end of file
diff --git a/libs/core/licenses/lucene-core-9.9.2.jar.sha1 b/libs/core/licenses/lucene-core-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..2d03d69369b9f
--- /dev/null
+++ b/libs/core/licenses/lucene-core-9.9.2.jar.sha1
@@ -0,0 +1 @@
+7699f80220fc80b08413902560904623b88beb9f
\ No newline at end of file
diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
index 6a92993f5dd42..307da89c18d48 100644
--- a/libs/core/src/main/java/org/opensearch/Version.java
+++ b/libs/core/src/main/java/org/opensearch/Version.java
@@ -98,8 +98,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     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_9_1);
-    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_9_1);
+    public static final Version V_2_12_0 = new Version(2120099, org.apache.lucene.util.Version.LUCENE_9_9_2);
+    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_9_2);
     public static final Version CURRENT = V_3_0_0;
 
     public static Version fromId(int id) {
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.9.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.9.1.jar.sha1
deleted file mode 100644
index 402cc36ba3d68..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1782a69d0e83af9cc3c65db0dcd2e7e7c1e5f90e
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.9.2.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..e073455415e24
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-9.9.2.jar.sha1
@@ -0,0 +1 @@
+045df3828b6460c032a6551040e31ea432b0aad6
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
deleted file mode 100644
index 30f215e47f8ad..0000000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..1f170375e9347
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9ed9b896d4b4e..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..a75ea81b7ee03
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
deleted file mode 100644
index 478e7cfba1470..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..7f5d1adbff740
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
deleted file mode 100644
index f0242709f34f7..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..c4a0c1fae8e24
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 1b533eea3b3b3..0000000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bda8b9376e992
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
deleted file mode 100644
index 70777be4dc636..0000000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..749cc807bcce2
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
deleted file mode 100644
index d7c15af9312fe..0000000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bd160c07ad0ff
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
deleted file mode 100644
index 5cacaf11a29ce..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..2dab4bff2cc0e
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 64797bf11aedc..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..b4b977fdad7de
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.1.jar.sha1
deleted file mode 100644
index dde9b7c100dc7..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-147cb42a90a29501d9ca6094ea0db1d213f3076a
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.2.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..b318a2d89db7d
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.2.jar.sha1
@@ -0,0 +1 @@
+f7e549fdac07140f4cd379a0f517c38434165e95
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.1.jar.sha1
deleted file mode 100644
index b70a22e9db096..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b034dd3a975763e083c7e11b5d0f7d516ab72590
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..87510efa881bc
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1
@@ -0,0 +1 @@
+eb19738fd3ca85071fef96978a056a7c94d8e793
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.1.jar.sha1
deleted file mode 100644
index 323f165c62790..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c405f2f7d0fc127d88dfbadd753469b2028fdf52
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.2.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..fb3746eb27840
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.2.jar.sha1
@@ -0,0 +1 @@
+7e83a83741155ececf9193a4f967e570e170236d
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.1.jar.sha1
deleted file mode 100644
index dd659ddf4de95..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-970e5775876c2d7e1b9af7421a4b17d96f63faf4
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..e88299f106bb2
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1
@@ -0,0 +1 @@
+dabdea96c7a6d00363b0093a580e7d783efa69a4
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.1.jar.sha1
deleted file mode 100644
index ed0e81d8f1f75..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2421e5238e9b8484929291744d709dd743c01da1
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..05dd3328b032d
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1
@@ -0,0 +1 @@
+fb551d9ae6a1bf12bc90a4d26dd8fa3eefac8cb9
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.1.jar.sha1
deleted file mode 100644
index fd8e000088180..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a23e7de4cd9ae7af285c89dc1c55e0ac3f157fd3
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.2.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..b47a1e4052407
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.2.jar.sha1
@@ -0,0 +1 @@
+0d495b478861b2d29e0a58d273ca0e6e755292e9
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.1.jar.sha1
deleted file mode 100644
index d0e7a3b0c751c..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8d9bce1ea51db279878c51091dd9aefc7b335da4
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..b7d54cb230445
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1
@@ -0,0 +1 @@
+9958d813d4cfdd890b4611c679ed36775480fa0d
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
deleted file mode 100644
index 0232fc58f9357..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e237ce67ab230ed1ba749d6651b278333c21b3f
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..005cc2388bd89
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+9d4b3315bb625ec2d73fa569fb6bce4589243d5e
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
deleted file mode 100644
index f0242709f34f7..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..c4a0c1fae8e24
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
deleted file mode 100644
index 3b6cd3524d978..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b126ceba61275f38297cacd5ea0cd6d3addee04
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..4fc3f5c43edb0
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+129f9bd6aa0cf28bfd7d45a8b6a598eed9c67702
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9d01e814971f2..0000000000000
--- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-50a2d899a8f8a68daed1a9b6d7750184310cc45f
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..3dcfa7f26db06
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+bffc88b7c56d7b553453e4244247a1b0ba1fdc8a
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
deleted file mode 100644
index 987b524aedc98..0000000000000
--- a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f1210e5856fecb9182d58c0d33fa6e946b344b40
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..0617c6999c586
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+3970474ed55aa1e3e8de5a5602c342c6b8155371
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 64797bf11aedc..0000000000000
--- a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..b4b977fdad7de
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.1.13.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.1.13.jar.sha1
deleted file mode 100644
index 5eaf96739ed72..0000000000000
--- a/plugins/repository-azure/licenses/reactor-netty-core-1.1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-faea23e582978a34f6a932b81e86206ec2314990
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.1.15.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.1.15.jar.sha1
new file mode 100644
index 0000000000000..c30a99a2338b4
--- /dev/null
+++ b/plugins/repository-azure/licenses/reactor-netty-core-1.1.15.jar.sha1
@@ -0,0 +1 @@
+3221d405ad55a573cf29875a8244a4217cf07185
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.1.13.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.1.13.jar.sha1
deleted file mode 100644
index 091125169c696..0000000000000
--- a/plugins/repository-azure/licenses/reactor-netty-http-1.1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5af7bc746050d080891a5446cca2c96a0c51d03
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.1.15.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.1.15.jar.sha1
new file mode 100644
index 0000000000000..ab3171cd02b73
--- /dev/null
+++ b/plugins/repository-azure/licenses/reactor-netty-http-1.1.15.jar.sha1
@@ -0,0 +1 @@
+c79756fa2dfc28ac81fc9d23a14b17c656c3e560
\ No newline at end of file
diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
index e0651da8d39c8..2ce67b1f25a80 100644
--- a/plugins/repository-gcs/build.gradle
+++ b/plugins/repository-gcs/build.gradle
@@ -78,7 +78,7 @@ dependencies {
   api 'com.google.http-client:google-http-client:1.43.3'
   api 'com.google.http-client:google-http-client-appengine:1.43.3'
   api 'com.google.http-client:google-http-client-gson:1.43.3'
-  api 'com.google.http-client:google-http-client-jackson2:1.43.3'
+  api 'com.google.http-client:google-http-client-jackson2:1.44.1'
 
   api 'com.google.oauth-client:google-oauth-client:1.34.1'
 
diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.43.3.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.43.3.jar.sha1
deleted file mode 100644
index 8380b9fb770b5..0000000000000
--- a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.43.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-689da86469d19a01c726c8c24477b95c8a834bbe
\ No newline at end of file
diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.44.1.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.44.1.jar.sha1
new file mode 100644
index 0000000000000..4472ffbbebe1c
--- /dev/null
+++ b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.44.1.jar.sha1
@@ -0,0 +1 @@
+3f1947de0fd9eb250af16abe6103c11e68d11635
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9110503f67304..0000000000000
--- a/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d75246285e5fac6f6dad47e387ed4f46f36e521d
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.106.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..f9affd7887093
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/netty-all-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+6ec5bd2be65d5529e58e9e482b747c1135b3736b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1
deleted file mode 100644
index 30f215e47f8ad..0000000000000
--- a/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..1f170375e9347
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9ed9b896d4b4e..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..a75ea81b7ee03
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1
deleted file mode 100644
index 478e7cfba1470..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..7f5d1adbff740
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
deleted file mode 100644
index f0242709f34f7..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..c4a0c1fae8e24
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 1b533eea3b3b3..0000000000000
--- a/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bda8b9376e992
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1
deleted file mode 100644
index 70777be4dc636..0000000000000
--- a/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..749cc807bcce2
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1
deleted file mode 100644
index d7c15af9312fe..0000000000000
--- a/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bd160c07ad0ff
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1
deleted file mode 100644
index 5cacaf11a29ce..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..2dab4bff2cc0e
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1
deleted file mode 100644
index 522d85a3bf12e..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-700fdbabab44709b0eccffe8f91c4226a5787356
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..58b668b7e80a9
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c058d5c712e00e8560e519970b3d27747778b8f2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 64797bf11aedc..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..b4b977fdad7de
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
index 3a55fcb0bdbcd..25f361b40636e 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
@@ -514,7 +514,7 @@ private static List<ListObjectsV2Response> executeListing(
             for (ListObjectsV2Response listObjectsV2Response : listObjectsIterable) {
                 results.add(listObjectsV2Response);
                 totalObjects += listObjectsV2Response.contents().size();
-                if (limit != -1 && totalObjects > limit) {
+                if (limit != -1 && totalObjects >= limit) {
                     break;
                 }
             }
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
index 4fda0ee95a3ec..e44f408e6dd12 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
@@ -201,6 +201,12 @@ final class S3ClientSettings {
         key -> Setting.intSetting(key, 500, Property.NodeScope)
     );
 
+    static final Setting.AffixSetting<Integer> MAX_SYNC_CONNECTIONS_SETTING = Setting.affixKeySetting(
+        PREFIX,
+        "max_sync_connections",
+        key -> Setting.intSetting(key, 500, Property.NodeScope)
+    );
+
     /** Connection acquisition timeout for new connections to S3. */
     static final Setting.AffixSetting<TimeValue> CONNECTION_ACQUISITION_TIMEOUT = Setting.affixKeySetting(
         PREFIX,
@@ -284,10 +290,13 @@ final class S3ClientSettings {
     /** The connection TTL for the s3 client */
     final int connectionTTLMillis;
 
-    /** The max number of connections for the s3 client */
+    /** The max number of connections for the s3 async client */
     final int maxConnections;
 
-    /** The connnection acquisition timeout for the s3 async client */
+    /** The max number of connections for the s3 sync client */
+    final int maxSyncConnections;
+
+    /** The connnection acquisition timeout for the s3 sync and async client */
     final int connectionAcquisitionTimeoutMillis;
 
     /** The number of retries to use for the s3 client. */
@@ -318,6 +327,7 @@ private S3ClientSettings(
         int connectionTimeoutMillis,
         int connectionTTLMillis,
         int maxConnections,
+        int maxSyncConnections,
         int connectionAcquisitionTimeoutMillis,
         int maxRetries,
         boolean throttleRetries,
@@ -336,6 +346,7 @@ private S3ClientSettings(
         this.connectionTimeoutMillis = connectionTimeoutMillis;
         this.connectionTTLMillis = connectionTTLMillis;
         this.maxConnections = maxConnections;
+        this.maxSyncConnections = maxSyncConnections;
         this.connectionAcquisitionTimeoutMillis = connectionAcquisitionTimeoutMillis;
         this.maxRetries = maxRetries;
         this.throttleRetries = throttleRetries;
@@ -386,6 +397,9 @@ S3ClientSettings refine(Settings repositorySettings) {
             ).millis()
         );
         final int newMaxConnections = Math.toIntExact(getRepoSettingOrDefault(MAX_CONNECTIONS_SETTING, normalizedSettings, maxConnections));
+        final int newMaxSyncConnections = Math.toIntExact(
+            getRepoSettingOrDefault(MAX_SYNC_CONNECTIONS_SETTING, normalizedSettings, maxConnections)
+        );
         final int newMaxRetries = getRepoSettingOrDefault(MAX_RETRIES_SETTING, normalizedSettings, maxRetries);
         final boolean newThrottleRetries = getRepoSettingOrDefault(USE_THROTTLE_RETRIES_SETTING, normalizedSettings, throttleRetries);
         final boolean newPathStyleAccess = getRepoSettingOrDefault(USE_PATH_STYLE_ACCESS, normalizedSettings, pathStyleAccess);
@@ -433,6 +447,7 @@ S3ClientSettings refine(Settings repositorySettings) {
             newConnectionTimeoutMillis,
             newConnectionTTLMillis,
             newMaxConnections,
+            newMaxSyncConnections,
             newConnectionAcquisitionTimeoutMillis,
             newMaxRetries,
             newThrottleRetries,
@@ -563,6 +578,7 @@ static S3ClientSettings getClientSettings(final Settings settings, final String
             Math.toIntExact(getConfigValue(settings, clientName, CONNECTION_TIMEOUT_SETTING).millis()),
             Math.toIntExact(getConfigValue(settings, clientName, CONNECTION_TTL_SETTING).millis()),
             Math.toIntExact(getConfigValue(settings, clientName, MAX_CONNECTIONS_SETTING)),
+            Math.toIntExact(getConfigValue(settings, clientName, MAX_SYNC_CONNECTIONS_SETTING)),
             Math.toIntExact(getConfigValue(settings, clientName, CONNECTION_ACQUISITION_TIMEOUT).millis()),
             getConfigValue(settings, clientName, MAX_RETRIES_SETTING),
             getConfigValue(settings, clientName, USE_THROTTLE_RETRIES_SETTING),
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
index 24387fb98a425..fe81da31432f4 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
@@ -279,6 +279,8 @@ protected PasswordAuthentication getPasswordAuthentication() {
         }
 
         clientBuilder.socketTimeout(Duration.ofMillis(clientSettings.readTimeoutMillis));
+        clientBuilder.maxConnections(clientSettings.maxSyncConnections);
+        clientBuilder.connectionAcquisitionTimeout(Duration.ofMillis(clientSettings.connectionAcquisitionTimeoutMillis));
 
         return clientBuilder;
     }
diff --git a/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java b/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java
index 58ad290a31e85..2b45e9cfe2d4b 100644
--- a/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java
+++ b/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java
@@ -916,6 +916,15 @@ public void testListBlobsByPrefixInLexicographicOrderWithLimitLessThanPageSize()
         testListBlobsByPrefixInLexicographicOrder(2, 1, BlobContainer.BlobNameSortOrder.LEXICOGRAPHIC);
     }
 
+    /**
+     * Test the boundary value at page size to ensure
+     * unnecessary calls are not made to S3 by fetching the next page.
+     * @throws IOException
+     */
+    public void testListBlobsByPrefixInLexicographicOrderWithLimitEqualToPageSize() throws IOException {
+        testListBlobsByPrefixInLexicographicOrder(5, 1, BlobContainer.BlobNameSortOrder.LEXICOGRAPHIC);
+    }
+
     public void testListBlobsByPrefixInLexicographicOrderWithLimitGreaterThanPageSize() throws IOException {
         testListBlobsByPrefixInLexicographicOrder(8, 2, BlobContainer.BlobNameSortOrder.LEXICOGRAPHIC);
     }
diff --git a/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3ClientSettingsTests.java b/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3ClientSettingsTests.java
index f27c8387b6e45..b47749553aeba 100644
--- a/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3ClientSettingsTests.java
+++ b/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3ClientSettingsTests.java
@@ -74,6 +74,8 @@ public void testThereIsADefaultClientByDefault() {
         assertThat(defaultSettings.connectionTimeoutMillis, is(10 * 1000));
         assertThat(defaultSettings.connectionTTLMillis, is(5 * 1000));
         assertThat(defaultSettings.maxConnections, is(500));
+        assertThat(defaultSettings.maxSyncConnections, is(500));
+        assertThat(defaultSettings.connectionAcquisitionTimeoutMillis, is(15 * 60 * 1000));
         assertThat(defaultSettings.maxRetries, is(3));
         assertThat(defaultSettings.throttleRetries, is(true));
     }
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1
deleted file mode 100644
index 30f215e47f8ad..0000000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..1f170375e9347
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9ed9b896d4b4e..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..a75ea81b7ee03
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1
deleted file mode 100644
index 478e7cfba1470..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..7f5d1adbff740
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 1b533eea3b3b3..0000000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bda8b9376e992
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1
deleted file mode 100644
index 70777be4dc636..0000000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..749cc807bcce2
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1
deleted file mode 100644
index d7c15af9312fe..0000000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bd160c07ad0ff
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1
deleted file mode 100644
index 5cacaf11a29ce..0000000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..2dab4bff2cc0e
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
deleted file mode 100644
index 30f215e47f8ad..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..1f170375e9347
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9ed9b896d4b4e..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..a75ea81b7ee03
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
deleted file mode 100644
index 0232fc58f9357..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e237ce67ab230ed1ba749d6651b278333c21b3f
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..005cc2388bd89
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+9d4b3315bb625ec2d73fa569fb6bce4589243d5e
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
deleted file mode 100644
index 478e7cfba1470..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..7f5d1adbff740
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
deleted file mode 100644
index f0242709f34f7..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..c4a0c1fae8e24
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 1b533eea3b3b3..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bda8b9376e992
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
deleted file mode 100644
index 70777be4dc636..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..749cc807bcce2
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
deleted file mode 100644
index d7c15af9312fe..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bd160c07ad0ff
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
deleted file mode 100644
index 987b524aedc98..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f1210e5856fecb9182d58c0d33fa6e946b344b40
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..0617c6999c586
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+3970474ed55aa1e3e8de5a5602c342c6b8155371
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
deleted file mode 100644
index 5cacaf11a29ce..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..2dab4bff2cc0e
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 64797bf11aedc..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..b4b977fdad7de
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.13.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.13.jar.sha1
deleted file mode 100644
index 5eaf96739ed72..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-faea23e582978a34f6a932b81e86206ec2314990
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.15.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.15.jar.sha1
new file mode 100644
index 0000000000000..c30a99a2338b4
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.15.jar.sha1
@@ -0,0 +1 @@
+3221d405ad55a573cf29875a8244a4217cf07185
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.13.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.13.jar.sha1
deleted file mode 100644
index 091125169c696..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5af7bc746050d080891a5446cca2c96a0c51d03
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.15.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.15.jar.sha1
new file mode 100644
index 0000000000000..ab3171cd02b73
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.15.jar.sha1
@@ -0,0 +1 @@
+c79756fa2dfc28ac81fc9d23a14b17c656c3e560
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.9.1.jar.sha1 b/server/licenses/lucene-analysis-common-9.9.1.jar.sha1
deleted file mode 100644
index c9e6120da7497..0000000000000
--- a/server/licenses/lucene-analysis-common-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24c8401b530308f9568eb7b408c2029c63f564c6
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.9.2.jar.sha1 b/server/licenses/lucene-analysis-common-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..6eefe1b002fde
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-9.9.2.jar.sha1
@@ -0,0 +1 @@
+2a4712ee9d87e0f9942a81195dbd5223dbeaa541
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.9.1.jar.sha1 b/server/licenses/lucene-backward-codecs-9.9.1.jar.sha1
deleted file mode 100644
index 69ecf6aa68200..0000000000000
--- a/server/licenses/lucene-backward-codecs-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-11c46007366bb037be7d271ab0a5849b1d544662
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.9.2.jar.sha1 b/server/licenses/lucene-backward-codecs-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..377acc22a1d6b
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-9.9.2.jar.sha1
@@ -0,0 +1 @@
+b53707366cf2891bb301f85a44c5108fc2d5d1b5
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.9.1.jar.sha1 b/server/licenses/lucene-core-9.9.1.jar.sha1
deleted file mode 100644
index ae596196d9e6a..0000000000000
--- a/server/licenses/lucene-core-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55249fa9a0ed321adcf8283c6f3b649a6812b0a9
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.9.2.jar.sha1 b/server/licenses/lucene-core-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..2d03d69369b9f
--- /dev/null
+++ b/server/licenses/lucene-core-9.9.2.jar.sha1
@@ -0,0 +1 @@
+7699f80220fc80b08413902560904623b88beb9f
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.9.1.jar.sha1 b/server/licenses/lucene-grouping-9.9.1.jar.sha1
deleted file mode 100644
index e7df056400661..0000000000000
--- a/server/licenses/lucene-grouping-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2f2785e17c5c823cc8f41a7ddb4647aaca8ee773
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.9.2.jar.sha1 b/server/licenses/lucene-grouping-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..1e321d751bff4
--- /dev/null
+++ b/server/licenses/lucene-grouping-9.9.2.jar.sha1
@@ -0,0 +1 @@
+72b6c47fd80933d259859d38325e3e020c8e017b
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.9.1.jar.sha1 b/server/licenses/lucene-highlighter-9.9.1.jar.sha1
deleted file mode 100644
index 828c7294aa586..0000000000000
--- a/server/licenses/lucene-highlighter-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-30928513461bf79a5cb057e84da7d34a1e53227d
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.9.2.jar.sha1 b/server/licenses/lucene-highlighter-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..d5c2e2a5504f2
--- /dev/null
+++ b/server/licenses/lucene-highlighter-9.9.2.jar.sha1
@@ -0,0 +1 @@
+0968d74d6794af65798819304f10ceb947080332
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.9.1.jar.sha1 b/server/licenses/lucene-join-9.9.1.jar.sha1
deleted file mode 100644
index 34b44ca8c6ad5..0000000000000
--- a/server/licenses/lucene-join-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b9c8cc99632280148f92b4c0a64111c482d5d0ac
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.9.2.jar.sha1 b/server/licenses/lucene-join-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..60da109fb5c83
--- /dev/null
+++ b/server/licenses/lucene-join-9.9.2.jar.sha1
@@ -0,0 +1 @@
+902e4b65686e29c1489a7cdf43ed2ce3b7fe8ace
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.9.1.jar.sha1 b/server/licenses/lucene-memory-9.9.1.jar.sha1
deleted file mode 100644
index b75fba4c331e9..0000000000000
--- a/server/licenses/lucene-memory-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-49f820b1b321860fa42a4f7583e8ed8f77b9c1c2
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.9.2.jar.sha1 b/server/licenses/lucene-memory-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..bebb36d7ed684
--- /dev/null
+++ b/server/licenses/lucene-memory-9.9.2.jar.sha1
@@ -0,0 +1 @@
+08175beb4135c23e6918c822381cd51cd2e118a8
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.9.1.jar.sha1 b/server/licenses/lucene-misc-9.9.1.jar.sha1
deleted file mode 100644
index f1e1e056004e9..0000000000000
--- a/server/licenses/lucene-misc-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db7c30217602dfcda394a4d0f0a9e68140d385a6
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.9.2.jar.sha1 b/server/licenses/lucene-misc-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..15f572ec715bf
--- /dev/null
+++ b/server/licenses/lucene-misc-9.9.2.jar.sha1
@@ -0,0 +1 @@
+39b015aa603db42b55f0833193bdfc75d38842ba
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.9.1.jar.sha1 b/server/licenses/lucene-queries-9.9.1.jar.sha1
deleted file mode 100644
index 888b9b4a05ec8..0000000000000
--- a/server/licenses/lucene-queries-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d157547bd24edc8e9d9d59c273107dc3ac5fde5e
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.9.2.jar.sha1 b/server/licenses/lucene-queries-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..9a94e40b69e85
--- /dev/null
+++ b/server/licenses/lucene-queries-9.9.2.jar.sha1
@@ -0,0 +1 @@
+671252594e15280818f56d4b369bc48c0ab00dac
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.9.1.jar.sha1 b/server/licenses/lucene-queryparser-9.9.1.jar.sha1
deleted file mode 100644
index 1ce8a069a0f4e..0000000000000
--- a/server/licenses/lucene-queryparser-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-12d844fe224f6f97c510ac20d68903ed7f626f6c
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.9.2.jar.sha1 b/server/licenses/lucene-queryparser-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..f23292999ae6a
--- /dev/null
+++ b/server/licenses/lucene-queryparser-9.9.2.jar.sha1
@@ -0,0 +1 @@
+7cf8dea63ab511ea9a322916198c3abd0402c8b2
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.9.1.jar.sha1 b/server/licenses/lucene-sandbox-9.9.1.jar.sha1
deleted file mode 100644
index 14fd86dadc404..0000000000000
--- a/server/licenses/lucene-sandbox-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-272e588fd3d8c0a401b28a1ac715f27044bf62ec
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.9.2.jar.sha1 b/server/licenses/lucene-sandbox-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..a30f00d72a689
--- /dev/null
+++ b/server/licenses/lucene-sandbox-9.9.2.jar.sha1
@@ -0,0 +1 @@
+4e2bdc6a5b65dd15b78477cf2c49cf7b707ba757
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.9.1.jar.sha1 b/server/licenses/lucene-spatial-extras-9.9.1.jar.sha1
deleted file mode 100644
index 0efd5a7595bfe..0000000000000
--- a/server/licenses/lucene-spatial-extras-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e066432e7ab02b2a4914f989bcd8c44adbf340ad
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.9.2.jar.sha1 b/server/licenses/lucene-spatial-extras-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..dafeee401659a
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-9.9.2.jar.sha1
@@ -0,0 +1 @@
+2693d4d4d3b9a0bf5b632ccbb01132eade1c4e14
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.9.1.jar.sha1 b/server/licenses/lucene-spatial3d-9.9.1.jar.sha1
deleted file mode 100644
index 7f06466e4c721..0000000000000
--- a/server/licenses/lucene-spatial3d-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fa54c9b962778e28ebc0efb9f75297781350361a
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.9.2.jar.sha1 b/server/licenses/lucene-spatial3d-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..47a1c05187098
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-9.9.2.jar.sha1
@@ -0,0 +1 @@
+61866a44eafce499ebbc20bcb75c8b8a60a5449b
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.9.1.jar.sha1 b/server/licenses/lucene-suggest-9.9.1.jar.sha1
deleted file mode 100644
index 06732480d1b6c..0000000000000
--- a/server/licenses/lucene-suggest-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9554de5b22ae7483b344b94a9a956960b7a5d49c
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.9.2.jar.sha1 b/server/licenses/lucene-suggest-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..115983c932983
--- /dev/null
+++ b/server/licenses/lucene-suggest-9.9.2.jar.sha1
@@ -0,0 +1 @@
+352ad5296f48a482e2b65bb7d5d6ba2977bb035e
\ No newline at end of file
diff --git a/server/licenses/reactor-core-3.5.11.jar.sha1 b/server/licenses/reactor-core-3.5.11.jar.sha1
deleted file mode 100644
index e5ffdbc8a7840..0000000000000
--- a/server/licenses/reactor-core-3.5.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db2299757f562261eb775d13658e86ff06f91e8a
\ No newline at end of file
diff --git a/server/licenses/reactor-core-3.5.14.jar.sha1 b/server/licenses/reactor-core-3.5.14.jar.sha1
new file mode 100644
index 0000000000000..3b58e7a68bade
--- /dev/null
+++ b/server/licenses/reactor-core-3.5.14.jar.sha1
@@ -0,0 +1 @@
+6e0c97c2e78273a00fd4ed38016b19ff3c6de59e
\ No newline at end of file
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java
index cb050e17cb237..21554a8e4fb15 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java
@@ -60,6 +60,7 @@
 import static org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest.Metric.FS;
 import static org.opensearch.core.common.util.CollectionUtils.iterableAsArrayList;
 import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
@@ -789,6 +790,47 @@ public void testDefaultShardPreference() throws Exception {
         }
     }
 
+    public void testRestoreSearchableSnapshotWithIndexStoreTypeThrowsException() throws Exception {
+        final String snapshotName = "test-snap";
+        final String repoName = "test-repo";
+        final String indexName1 = "test-idx-1";
+        final int numReplicasIndex1 = randomIntBetween(1, 4);
+        final Client client = client();
+
+        internalCluster().ensureAtLeastNumDataNodes(numReplicasIndex1 + 1);
+        createIndexWithDocsAndEnsureGreen(numReplicasIndex1, 100, indexName1);
+
+        createRepositoryWithSettings(null, repoName);
+        takeSnapshot(client, snapshotName, repoName, indexName1);
+        deleteIndicesAndEnsureGreen(client, indexName1);
+
+        internalCluster().ensureAtLeastNumSearchNodes(numReplicasIndex1 + 1);
+
+        // set "index.store.type" to "remote_snapshot" in index settings of restore API and assert appropriate exception with error message
+        // is thrown.
+        final SnapshotRestoreException error = expectThrows(
+            SnapshotRestoreException.class,
+            () -> client.admin()
+                .cluster()
+                .prepareRestoreSnapshot(repoName, snapshotName)
+                .setRenamePattern("(.+)")
+                .setRenameReplacement("$1-copy")
+                .setIndexSettings(
+                    Settings.builder()
+                        .put(IndexModule.INDEX_STORE_TYPE_SETTING.getKey(), RestoreSnapshotRequest.StorageType.REMOTE_SNAPSHOT)
+                )
+                .setWaitForCompletion(true)
+                .execute()
+                .actionGet()
+        );
+        assertThat(
+            error.getMessage(),
+            containsString(
+                "cannot restore remote snapshot with index settings \"index.store.type\" set to \"remote_snapshot\". Instead use \"storage_type\": \"remote_snapshot\" as argument to restore."
+            )
+        );
+    }
+
     /**
      * Asserts the cache folder count to match the number of shards and the number of indices within the cache folder
      * as provided.
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 3384393d8feaf..4dde5d0ea013f 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
@@ -39,6 +39,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.Version;
+import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
 import org.opensearch.action.admin.indices.alias.Alias;
 import org.opensearch.action.admin.indices.create.CreateIndexClusterStateUpdateRequest;
 import org.opensearch.action.admin.indices.shrink.ResizeType;
@@ -135,6 +136,7 @@
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY;
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REPLICATION_TYPE;
 import static org.opensearch.cluster.metadata.Metadata.DEFAULT_REPLICA_COUNT_SETTING;
+import static org.opensearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
 import static org.opensearch.indices.IndicesService.CLUSTER_REPLICATION_TYPE_SETTING;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.isRemoteStoreAttributePresent;
 
@@ -816,6 +818,16 @@ static Settings aggregateIndexSettings(
         final Settings.Builder requestSettings = Settings.builder().put(request.settings());
 
         final Settings.Builder indexSettingsBuilder = Settings.builder();
+
+        // Store type of `remote_snapshot` is intended to be system-managed for searchable snapshot indexes so a special case is needed here
+        // to prevent a user specifying this value when creating an index
+        String storeTypeSetting = request.settings().get(INDEX_STORE_TYPE_SETTING.getKey());
+        if (storeTypeSetting != null && storeTypeSetting.equals(RestoreSnapshotRequest.StorageType.REMOTE_SNAPSHOT.toString())) {
+            throw new IllegalArgumentException(
+                "cannot create index with index setting \"index.store.type\" set to \"remote_snapshot\". Store type can be set to \"remote_snapshot\" only when restoring a remote snapshot by using \"storage_type\": \"remote_snapshot\""
+            );
+        }
+
         if (sourceMetadata == null) {
             final Settings.Builder additionalIndexSettings = Settings.builder();
             final Settings templateAndRequestSettings = Settings.builder().put(combinedTemplateSettings).put(request.settings()).build();
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/RemoteShardsBalancer.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/RemoteShardsBalancer.java
index e2f24e5f503df..a05938c176678 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/RemoteShardsBalancer.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/RemoteShardsBalancer.java
@@ -43,6 +43,8 @@ public final class RemoteShardsBalancer extends ShardsBalancer {
     private final Logger logger;
     private final RoutingAllocation allocation;
     private final RoutingNodes routingNodes;
+    // indicates if there are any nodes being throttled for allocating any unassigned shards
+    private boolean anyNodesThrottled = false;
 
     public RemoteShardsBalancer(Logger logger, RoutingAllocation allocation) {
         this.logger = logger;
@@ -358,12 +360,16 @@ private void allocateUnassignedReplicas(Queue<RoutingNode> nodeQueue, Map<String
     }
 
     private void ignoreRemainingShards(Map<String, UnassignedIndexShards> unassignedShardMap) {
+        // If any nodes are throttled during allocation, mark all remaining unassigned shards as THROTTLED
+        final UnassignedInfo.AllocationStatus status = anyNodesThrottled
+            ? UnassignedInfo.AllocationStatus.DECIDERS_THROTTLED
+            : UnassignedInfo.AllocationStatus.DECIDERS_NO;
         for (UnassignedIndexShards indexShards : unassignedShardMap.values()) {
             for (ShardRouting shard : indexShards.getPrimaries()) {
-                routingNodes.unassigned().ignoreShard(shard, UnassignedInfo.AllocationStatus.DECIDERS_NO, allocation.changes());
+                routingNodes.unassigned().ignoreShard(shard, status, allocation.changes());
             }
             for (ShardRouting shard : indexShards.getReplicas()) {
-                routingNodes.unassigned().ignoreShard(shard, UnassignedInfo.AllocationStatus.DECIDERS_NO, allocation.changes());
+                routingNodes.unassigned().ignoreShard(shard, status, allocation.changes());
             }
         }
     }
@@ -424,11 +430,11 @@ private void allocateUnassignedShards(
     private void tryAllocateUnassignedShard(Queue<RoutingNode> nodeQueue, ShardRouting shard) {
         boolean allocated = false;
         boolean throttled = false;
-        Set<String> nodesCheckedForShard = new HashSet<>();
+        int numNodesToCheck = nodeQueue.size();
         while (nodeQueue.isEmpty() == false) {
             RoutingNode node = nodeQueue.poll();
+            --numNodesToCheck;
             Decision allocateDecision = allocation.deciders().canAllocate(shard, node, allocation);
-            nodesCheckedForShard.add(node.nodeId());
             if (allocateDecision.type() == Decision.Type.YES) {
                 if (logger.isTraceEnabled()) {
                     logger.trace("Assigned shard [{}] to [{}]", shardShortSummary(shard), node.nodeId());
@@ -467,6 +473,10 @@ private void tryAllocateUnassignedShard(Queue<RoutingNode> nodeQueue, ShardRouti
                     }
                     nodeQueue.offer(node);
                 } else {
+                    if (nodeLevelDecision.type() == Decision.Type.THROTTLE) {
+                        anyNodesThrottled = true;
+                    }
+
                     if (logger.isTraceEnabled()) {
                         logger.trace(
                             "Cannot allocate any shard to node: [{}]. Removing from queue. Node level decisions: [{}],[{}]",
@@ -478,14 +488,14 @@ private void tryAllocateUnassignedShard(Queue<RoutingNode> nodeQueue, ShardRouti
                 }
 
                 // Break out if all nodes in the queue have been checked for this shard
-                if (nodeQueue.stream().allMatch(rn -> nodesCheckedForShard.contains(rn.nodeId()))) {
+                if (numNodesToCheck == 0) {
                     break;
                 }
             }
         }
 
         if (allocated == false) {
-            UnassignedInfo.AllocationStatus status = throttled
+            UnassignedInfo.AllocationStatus status = (throttled || anyNodesThrottled)
                 ? UnassignedInfo.AllocationStatus.DECIDERS_THROTTLED
                 : UnassignedInfo.AllocationStatus.DECIDERS_NO;
             routingNodes.unassigned().ignoreShard(shard, status, allocation.changes());
diff --git a/server/src/main/java/org/opensearch/common/time/DateFormatters.java b/server/src/main/java/org/opensearch/common/time/DateFormatters.java
index e74ab687b903b..527dce7677dd8 100644
--- a/server/src/main/java/org/opensearch/common/time/DateFormatters.java
+++ b/server/src/main/java/org/opensearch/common/time/DateFormatters.java
@@ -1299,6 +1299,41 @@ public class DateFormatters {
             .withResolverStyle(ResolverStyle.STRICT)
     );
 
+    /**
+     * Returns RFC 3339 a popular ISO 8601 profile compatible date time formatter and parser.
+     * This is not fully compatible to the existing spec, its more linient and closely follows w3c note on datetime
+     */
+
+    public static final DateFormatter RFC3339_LENIENT_DATE_FORMATTER = new JavaDateFormatter(
+        "rfc3339_lenient",
+        new OpenSearchDateTimeFormatter(STRICT_DATE_OPTIONAL_TIME_PRINTER),
+        new RFC3339CompatibleDateTimeFormatter(
+            new DateTimeFormatterBuilder().append(DATE_FORMATTER)
+                .optionalStart()
+                .appendLiteral('T')
+                .appendValue(HOUR_OF_DAY, 1, 2, SignStyle.NOT_NEGATIVE)
+                .appendLiteral(':')
+                .appendValue(MINUTE_OF_HOUR, 1, 2, SignStyle.NOT_NEGATIVE)
+                .optionalStart()
+                .appendLiteral(':')
+                .appendValue(SECOND_OF_MINUTE, 1, 2, SignStyle.NOT_NEGATIVE)
+                .optionalStart()
+                .appendFraction(NANO_OF_SECOND, 1, 9, true)
+                .optionalEnd()
+                .optionalStart()
+                .appendLiteral(',')
+                .appendFraction(NANO_OF_SECOND, 1, 9, false)
+                .optionalEnd()
+                .optionalStart()
+                .appendOffsetId()
+                .optionalEnd()
+                .optionalEnd()
+                .optionalEnd()
+                .toFormatter(Locale.ROOT)
+                .withResolverStyle(ResolverStyle.STRICT)
+        )
+    );
+
     private static final DateTimeFormatter HOUR_MINUTE_SECOND_FORMATTER = new DateTimeFormatterBuilder().append(HOUR_MINUTE_FORMATTER)
         .appendLiteral(":")
         .appendValue(SECOND_OF_MINUTE, 1, 2, SignStyle.NOT_NEGATIVE)
@@ -2152,6 +2187,8 @@ static DateFormatter forPattern(String input) {
             return STRICT_YEAR_MONTH;
         } else if (FormatNames.STRICT_YEAR_MONTH_DAY.matches(input)) {
             return STRICT_YEAR_MONTH_DAY;
+        } else if (FormatNames.RFC3339_LENIENT.matches(input)) {
+            return RFC3339_LENIENT_DATE_FORMATTER;
         } else {
             try {
                 return new JavaDateFormatter(
diff --git a/server/src/main/java/org/opensearch/common/time/FormatNames.java b/server/src/main/java/org/opensearch/common/time/FormatNames.java
index ba0a8fcf4a17a..ec5e825fc933e 100644
--- a/server/src/main/java/org/opensearch/common/time/FormatNames.java
+++ b/server/src/main/java/org/opensearch/common/time/FormatNames.java
@@ -44,6 +44,7 @@
  */
 public enum FormatNames {
     ISO8601(null, "iso8601"),
+    RFC3339_LENIENT(null, "rfc3339_lenient"),
     BASIC_DATE("basicDate", "basic_date"),
     BASIC_DATE_TIME("basicDateTime", "basic_date_time"),
     BASIC_DATE_TIME_NO_MILLIS("basicDateTimeNoMillis", "basic_date_time_no_millis"),
diff --git a/server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java b/server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java
index f711b14aeb928..033ea280e6172 100644
--- a/server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java
+++ b/server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java
@@ -36,6 +36,7 @@
 import org.opensearch.core.common.Strings;
 
 import java.text.ParsePosition;
+import java.time.DateTimeException;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
@@ -52,7 +53,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
@@ -70,11 +70,11 @@ class JavaDateFormatter implements DateFormatter {
 
     private final String format;
     private final String printFormat;
-    private final DateTimeFormatter printer;
-    private final List<DateTimeFormatter> parsers;
+    private final OpenSearchDateTimePrinter printer;
+    private final List<OpenSearchDateTimeFormatter> parsers;
     private final JavaDateFormatter roundupParser;
     private final Boolean canCacheLastParsedFormatter;
-    private volatile DateTimeFormatter lastParsedformatter = null;
+    private volatile OpenSearchDateTimeFormatter lastParsedformatter = null;
 
     /**
      * A round up formatter
@@ -83,11 +83,11 @@ class JavaDateFormatter implements DateFormatter {
      */
     static class RoundUpFormatter extends JavaDateFormatter {
 
-        RoundUpFormatter(String format, List<DateTimeFormatter> roundUpParsers) {
+        RoundUpFormatter(String format, List<OpenSearchDateTimeFormatter> roundUpParsers) {
             super(format, firstFrom(roundUpParsers), null, roundUpParsers);
         }
 
-        private static DateTimeFormatter firstFrom(List<DateTimeFormatter> roundUpParsers) {
+        private static OpenSearchDateTimeFormatter firstFrom(List<OpenSearchDateTimeFormatter> roundUpParsers) {
             return roundUpParsers.get(0);
         }
 
@@ -101,14 +101,18 @@ JavaDateFormatter getRoundupParser() {
     JavaDateFormatter(
         String format,
         String printFormat,
-        DateTimeFormatter printer,
+        OpenSearchDateTimePrinter printer,
         Boolean canCacheLastParsedFormatter,
-        DateTimeFormatter... parsers
+        OpenSearchDateTimeFormatter... parsers
     ) {
         this(format, printFormat, printer, ROUND_UP_BASE_FIELDS, canCacheLastParsedFormatter, parsers);
     }
 
     JavaDateFormatter(String format, DateTimeFormatter printer, DateTimeFormatter... parsers) {
+        this(format, format, wrapFormatter(printer), false, wrapAllFormatters(parsers));
+    }
+
+    JavaDateFormatter(String format, OpenSearchDateTimePrinter printer, OpenSearchDateTimeFormatter... parsers) {
         this(format, format, printer, false, parsers);
     }
 
@@ -127,19 +131,19 @@ JavaDateFormatter getRoundupParser() {
     JavaDateFormatter(
         String format,
         String printFormat,
-        DateTimeFormatter printer,
+        OpenSearchDateTimePrinter printer,
         BiConsumer<DateTimeFormatterBuilder, DateTimeFormatter> roundupParserConsumer,
         Boolean canCacheLastParsedFormatter,
-        DateTimeFormatter... parsers
+        OpenSearchDateTimeFormatter... parsers
     ) {
         if (printer == null) {
             throw new IllegalArgumentException("printer may not be null");
         }
-        long distinctZones = Arrays.stream(parsers).map(DateTimeFormatter::getZone).distinct().count();
+        long distinctZones = Arrays.stream(parsers).map(OpenSearchDateTimeFormatter::getZone).distinct().count();
         if (distinctZones > 1) {
             throw new IllegalArgumentException("formatters must have the same time zone");
         }
-        long distinctLocales = Arrays.stream(parsers).map(DateTimeFormatter::getLocale).distinct().count();
+        long distinctLocales = Arrays.stream(parsers).map(OpenSearchDateTimeFormatter::getLocale).distinct().count();
         if (distinctLocales > 1) {
             throw new IllegalArgumentException("formatters must have the same locale");
         }
@@ -149,12 +153,12 @@ JavaDateFormatter getRoundupParser() {
         this.canCacheLastParsedFormatter = canCacheLastParsedFormatter;
 
         if (parsers.length == 0) {
-            this.parsers = Collections.singletonList(printer);
+            this.parsers = Collections.singletonList((OpenSearchDateTimeFormatter) printer);
         } else {
             this.parsers = Arrays.asList(parsers);
         }
         List<DateTimeFormatter> roundUp = createRoundUpParser(format, roundupParserConsumer);
-        this.roundupParser = new RoundUpFormatter(format, roundUp);
+        this.roundupParser = new RoundUpFormatter(format, wrapAllFormatters(roundUp));
     }
 
     JavaDateFormatter(
@@ -163,7 +167,7 @@ JavaDateFormatter getRoundupParser() {
         BiConsumer<DateTimeFormatterBuilder, DateTimeFormatter> roundupParserConsumer,
         DateTimeFormatter... parsers
     ) {
-        this(format, format, printer, roundupParserConsumer, false, parsers);
+        this(format, format, wrapFormatter(printer), roundupParserConsumer, false, wrapAllFormatters(parsers));
     }
 
     /**
@@ -181,7 +185,8 @@ private List<DateTimeFormatter> createRoundUpParser(
     ) {
         if (format.contains("||") == false) {
             List<DateTimeFormatter> roundUpParsers = new ArrayList<>();
-            for (DateTimeFormatter parser : this.parsers) {
+            for (OpenSearchDateTimeFormatter customparser : this.parsers) {
+                DateTimeFormatter parser = customparser.getFormatter();
                 DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
                 builder.append(parser);
                 roundupParserConsumer.accept(builder, parser);
@@ -201,12 +206,12 @@ public static DateFormatter combined(
         assert formatters.size() > 0;
         assert printFormatter != null;
 
-        List<DateTimeFormatter> parsers = new ArrayList<>(formatters.size());
-        List<DateTimeFormatter> roundUpParsers = new ArrayList<>(formatters.size());
+        List<OpenSearchDateTimeFormatter> parsers = new ArrayList<>(formatters.size());
+        List<OpenSearchDateTimeFormatter> roundUpParsers = new ArrayList<>(formatters.size());
 
         assert printFormatter instanceof JavaDateFormatter;
         JavaDateFormatter javaPrintFormatter = (JavaDateFormatter) printFormatter;
-        DateTimeFormatter printer = javaPrintFormatter.getPrinter();
+        OpenSearchDateTimePrinter printer = javaPrintFormatter.getPrinter();
         for (DateFormatter formatter : formatters) {
             assert formatter instanceof JavaDateFormatter;
             JavaDateFormatter javaDateFormatter = (JavaDateFormatter) formatter;
@@ -227,9 +232,9 @@ public static DateFormatter combined(
     private JavaDateFormatter(
         String format,
         String printFormat,
-        DateTimeFormatter printer,
-        List<DateTimeFormatter> roundUpParsers,
-        List<DateTimeFormatter> parsers,
+        OpenSearchDateTimePrinter printer,
+        List<OpenSearchDateTimeFormatter> roundUpParsers,
+        List<OpenSearchDateTimeFormatter> parsers,
         Boolean canCacheLastParsedFormatter
     ) {
         this.format = format;
@@ -245,6 +250,15 @@ private JavaDateFormatter(
         DateTimeFormatter printer,
         List<DateTimeFormatter> roundUpParsers,
         List<DateTimeFormatter> parsers
+    ) {
+        this(format, format, wrapFormatter(printer), wrapAllFormatters(roundUpParsers), wrapAllFormatters(parsers), false);
+    }
+
+    private JavaDateFormatter(
+        String format,
+        OpenSearchDateTimePrinter printer,
+        List<OpenSearchDateTimeFormatter> roundUpParsers,
+        List<OpenSearchDateTimeFormatter> parsers
     ) {
         this(format, format, printer, roundUpParsers, parsers, false);
     }
@@ -253,7 +267,7 @@ JavaDateFormatter getRoundupParser() {
         return roundupParser;
     }
 
-    DateTimeFormatter getPrinter() {
+    OpenSearchDateTimePrinter getPrinter() {
         return printer;
     }
 
@@ -265,7 +279,7 @@ public TemporalAccessor parse(String input) {
 
         try {
             return doParse(input);
-        } catch (DateTimeParseException e) {
+        } catch (DateTimeException e) {
             throw new IllegalArgumentException("failed to parse date field [" + input + "] with format [" + format + "]", e);
         }
     }
@@ -289,14 +303,14 @@ private TemporalAccessor doParse(String input) {
             Object object = null;
             if (canCacheLastParsedFormatter && lastParsedformatter != null) {
                 ParsePosition pos = new ParsePosition(0);
-                object = lastParsedformatter.toFormat().parseObject(input, pos);
+                object = lastParsedformatter.parseObject(input, pos);
                 if (parsingSucceeded(object, input, pos)) {
                     return (TemporalAccessor) object;
                 }
             }
-            for (DateTimeFormatter formatter : parsers) {
+            for (OpenSearchDateTimeFormatter formatter : parsers) {
                 ParsePosition pos = new ParsePosition(0);
-                object = formatter.toFormat().parseObject(input, pos);
+                object = formatter.parseObject(input, pos);
                 if (parsingSucceeded(object, input, pos)) {
                     lastParsedformatter = formatter;
                     return (TemporalAccessor) object;
@@ -312,16 +326,28 @@ private boolean parsingSucceeded(Object object, String input, ParsePosition pos)
         return object != null && pos.getIndex() == input.length();
     }
 
+    private static OpenSearchDateTimeFormatter wrapFormatter(DateTimeFormatter formatter) {
+        return new OpenSearchDateTimeFormatter(formatter);
+    }
+
+    private static OpenSearchDateTimeFormatter[] wrapAllFormatters(DateTimeFormatter... formatters) {
+        return Arrays.stream(formatters).map(JavaDateFormatter::wrapFormatter).toArray(OpenSearchDateTimeFormatter[]::new);
+    }
+
+    private static List<OpenSearchDateTimeFormatter> wrapAllFormatters(List<DateTimeFormatter> formatters) {
+        return formatters.stream().map(JavaDateFormatter::wrapFormatter).collect(Collectors.toList());
+    }
+
     @Override
     public DateFormatter withZone(ZoneId zoneId) {
         // shortcurt to not create new objects unnecessarily
         if (zoneId.equals(zone())) {
             return this;
         }
-        List<DateTimeFormatter> parsers = new CopyOnWriteArrayList<>(
+        List<OpenSearchDateTimeFormatter> parsers = new ArrayList<>(
             this.parsers.stream().map(p -> p.withZone(zoneId)).collect(Collectors.toList())
         );
-        List<DateTimeFormatter> roundUpParsers = this.roundupParser.getParsers()
+        List<OpenSearchDateTimeFormatter> roundUpParsers = this.roundupParser.getParsers()
             .stream()
             .map(p -> p.withZone(zoneId))
             .collect(Collectors.toList());
@@ -334,10 +360,10 @@ public DateFormatter withLocale(Locale locale) {
         if (locale.equals(locale())) {
             return this;
         }
-        List<DateTimeFormatter> parsers = new CopyOnWriteArrayList<>(
+        List<OpenSearchDateTimeFormatter> parsers = new ArrayList<>(
             this.parsers.stream().map(p -> p.withLocale(locale)).collect(Collectors.toList())
         );
-        List<DateTimeFormatter> roundUpParsers = this.roundupParser.getParsers()
+        List<OpenSearchDateTimeFormatter> roundUpParsers = this.roundupParser.getParsers()
             .stream()
             .map(p -> p.withLocale(locale))
             .collect(Collectors.toList());
@@ -396,7 +422,7 @@ public String toString() {
         return String.format(Locale.ROOT, "format[%s] locale[%s]", format, locale());
     }
 
-    Collection<DateTimeFormatter> getParsers() {
+    Collection<OpenSearchDateTimeFormatter> getParsers() {
         return parsers;
     }
 }
diff --git a/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimeFormatter.java b/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimeFormatter.java
new file mode 100644
index 0000000000000..3a629d8843949
--- /dev/null
+++ b/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimeFormatter.java
@@ -0,0 +1,85 @@
+/*
+ * 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.time;
+
+import java.text.Format;
+import java.text.ParsePosition;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalQuery;
+import java.util.Locale;
+
+/**
+* Wrapper class for DateTimeFormatter{@link java.time.format.DateTimeFormatter}
+* to allow for custom implementations for datetime parsing/formatting
+ */
+class OpenSearchDateTimeFormatter implements OpenSearchDateTimePrinter {
+    private final DateTimeFormatter formatter;
+
+    public OpenSearchDateTimeFormatter(String pattern) {
+        this.formatter = DateTimeFormatter.ofPattern(pattern, Locale.ROOT);
+    }
+
+    public OpenSearchDateTimeFormatter(String pattern, Locale locale) {
+        this.formatter = DateTimeFormatter.ofPattern(pattern, locale);
+    }
+
+    public OpenSearchDateTimeFormatter(DateTimeFormatter formatter) {
+        this.formatter = formatter;
+    }
+
+    public OpenSearchDateTimeFormatter withLocale(Locale locale) {
+        return new OpenSearchDateTimeFormatter(getFormatter().withLocale(locale));
+    }
+
+    public OpenSearchDateTimeFormatter withZone(ZoneId zoneId) {
+        return new OpenSearchDateTimeFormatter(getFormatter().withZone(zoneId));
+    }
+
+    public String format(TemporalAccessor temporal) {
+        return this.getFormatter().format(temporal);
+    }
+
+    public TemporalAccessor parse(CharSequence text, ParsePosition position) {
+        return this.getFormatter().parse(text, position);
+    }
+
+    public TemporalAccessor parse(CharSequence text) {
+        return this.getFormatter().parse(text);
+    }
+
+    public <T> T parse(CharSequence text, TemporalQuery<T> query) {
+        return this.getFormatter().parse(text, query);
+    }
+
+    public ZoneId getZone() {
+        return this.getFormatter().getZone();
+    }
+
+    public Locale getLocale() {
+        return this.getFormatter().getLocale();
+    }
+
+    public TemporalAccessor parse(String input) {
+        return formatter.parse(input);
+    }
+
+    public DateTimeFormatter getFormatter() {
+        return formatter;
+    }
+
+    public Format toFormat() {
+        return getFormatter().toFormat();
+    }
+
+    public Object parseObject(String text, ParsePosition pos) {
+        return getFormatter().toFormat().parseObject(text, pos);
+    }
+}
diff --git a/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimePrinter.java b/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimePrinter.java
new file mode 100644
index 0000000000000..350bae21b22b1
--- /dev/null
+++ b/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimePrinter.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.common.time;
+
+import java.time.ZoneId;
+import java.time.temporal.TemporalAccessor;
+import java.util.Locale;
+
+/**
+ * Interface for DateTimeFormatter{@link java.time.format.DateTimeFormatter}
+ * to allow for custom implementations for datetime formatting
+ */
+interface OpenSearchDateTimePrinter {
+
+    public OpenSearchDateTimePrinter withLocale(Locale locale);
+
+    public OpenSearchDateTimePrinter withZone(ZoneId zoneId);
+
+    public String format(TemporalAccessor temporal);
+
+    public Locale getLocale();
+
+    public ZoneId getZone();
+}
diff --git a/server/src/main/java/org/opensearch/common/time/RFC3339CompatibleDateTimeFormatter.java b/server/src/main/java/org/opensearch/common/time/RFC3339CompatibleDateTimeFormatter.java
new file mode 100644
index 0000000000000..98b87efd2380b
--- /dev/null
+++ b/server/src/main/java/org/opensearch/common/time/RFC3339CompatibleDateTimeFormatter.java
@@ -0,0 +1,428 @@
+/*
+ * 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.
+ */
+
+/*
+ * Based on code from the Internet Time Utility project (https://github.com/ethlo/itu) under the Apache License, version 2.0.
+ * Copyright (C) 2017 Morten Haraldsen (ethlo)
+ * Modifications (C) OpenSearch Contributors. All Rights Reserved.
+ */
+
+package org.opensearch.common.time;
+
+import java.text.ParsePosition;
+import java.time.DateTimeException;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
+import java.util.Arrays;
+import java.util.Locale;
+
+/**
+ * Defines a close profile of RFC3339 datetime format where the date is mandatory and the time is optional.
+ * <p>
+ * The returned formatter can only be used for parsing, printing is unsupported.
+ * <p>
+ * This parser can parse zoned datetimes.
+ * The parser is strict by default, thus time string {@code 24:00} cannot be parsed.
+ * <p>
+ * It accepts formats described by the following syntax:
+ * <pre>
+ * Year:
+ *       YYYY (eg 1997)
+ *    Year and month:
+ *       YYYY-MM (eg 1997-07)
+ *    Complete date:
+ *       YYYY-MM-DD (eg 1997-07-16)
+ *    Complete date plus hours and minutes:
+ *       YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
+ *    Complete date plus hours, minutes and seconds:
+ *       YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
+ *    Complete date plus hours, minutes, seconds and a decimal fraction of a second
+ *       YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
+ *       YYYY-MM-DDThh:mm:ss,sTZD (eg 1997-07-16T19:20:30,45+01:00)
+ * where:
+ *
+ *      YYYY = four-digit year
+ *      MM   = two-digit month (01=January, etc.)
+ *      DD   = two-digit day of month (01 through 31)
+ *      hh   = two digits of hour (00 through 23) (am/pm NOT allowed)
+ *      mm   = two digits of minute (00 through 59)
+ *      ss   = two digits of second (00 through 59)
+ *      s    = one or more(max 9) digits representing a decimal fraction of a second
+ *      TZD  = time zone designator (Z or z or +hh:mm or -hh:mm)
+ * </pre>
+ */
+final class RFC3339CompatibleDateTimeFormatter extends OpenSearchDateTimeFormatter {
+    public static final char DATE_SEPARATOR = '-';
+    public static final char TIME_SEPARATOR = ':';
+    public static final char SEPARATOR_UPPER = 'T';
+    private static final char PLUS = '+';
+    private static final char MINUS = '-';
+    private static final char SEPARATOR_LOWER = 't';
+    private static final char SEPARATOR_SPACE = ' ';
+    private static final char FRACTION_SEPARATOR_1 = '.';
+    private static final char FRACTION_SEPARATOR_2 = ',';
+    private static final char ZULU_UPPER = 'Z';
+    private static final char ZULU_LOWER = 'z';
+
+    private ZoneId zone;
+
+    public RFC3339CompatibleDateTimeFormatter(String pattern) {
+        super(pattern);
+    }
+
+    public RFC3339CompatibleDateTimeFormatter(java.time.format.DateTimeFormatter formatter) {
+        super(formatter);
+    }
+
+    public RFC3339CompatibleDateTimeFormatter(java.time.format.DateTimeFormatter formatter, ZoneId zone) {
+        super(formatter);
+        this.zone = zone;
+    }
+
+    @Override
+    public OpenSearchDateTimeFormatter withZone(ZoneId zoneId) {
+        return new RFC3339CompatibleDateTimeFormatter(getFormatter().withZone(zoneId), zoneId);
+    }
+
+    @Override
+    public OpenSearchDateTimeFormatter withLocale(Locale locale) {
+        return new RFC3339CompatibleDateTimeFormatter(getFormatter().withLocale(locale));
+    }
+
+    @Override
+    public Object parseObject(String text, ParsePosition pos) {
+        try {
+            return parse(text);
+        } catch (DateTimeException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public TemporalAccessor parse(final String dateTime) {
+        OffsetDateTime parsedDatetime = parse(dateTime, new ParsePosition(0));
+        return zone == null ? parsedDatetime : parsedDatetime.atZoneSameInstant(zone);
+    }
+
+    public OffsetDateTime parse(String date, ParsePosition pos) {
+        if (date == null) {
+            throw new IllegalArgumentException("date cannot be null");
+        }
+
+        final int len = date.length() - pos.getIndex();
+        if (len <= 0) {
+            throw new DateTimeParseException("out of bound parse position", date, pos.getIndex());
+        }
+        final char[] chars = date.substring(pos.getIndex()).toCharArray();
+
+        // Date portion
+
+        // YEAR
+        final int years = getYear(chars, pos);
+        if (4 == len) {
+            return OffsetDateTime.of(years, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        }
+
+        // MONTH
+        consumeChar(chars, pos, DATE_SEPARATOR);
+        final int months = getMonth(chars, pos);
+        if (7 == len) {
+            return OffsetDateTime.of(years, months, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        }
+
+        // DAY
+        consumeChar(chars, pos, DATE_SEPARATOR);
+        final int days = getDay(chars, pos);
+        if (10 == len) {
+            return OffsetDateTime.of(years, months, days, 0, 0, 0, 0, ZoneOffset.UTC);
+        }
+
+        // HOURS
+        consumeChar(chars, pos, SEPARATOR_UPPER, SEPARATOR_LOWER, SEPARATOR_SPACE);
+        final int hours = getHour(chars, pos);
+
+        // MINUTES
+        consumeChar(chars, pos, TIME_SEPARATOR);
+        final int minutes = getMinute(chars, pos);
+        if (16 == len) {
+            throw new DateTimeParseException("No timezone offset information", new String(chars), pos.getIndex());
+        }
+
+        // SECONDS or TIMEZONE
+        return handleTime(chars, pos, years, months, days, hours, minutes);
+    }
+
+    private static boolean isDigit(char c) {
+        return (c >= '0' && c <= '9');
+    }
+
+    private static int digit(char c) {
+        return c - '0';
+    }
+
+    private static int readInt(final char[] strNum, ParsePosition pos, int n) {
+        int start = pos.getIndex(), end = start + n;
+        if (end > strNum.length) {
+            pos.setErrorIndex(end);
+            throw new DateTimeParseException("Unexpected end of expression at position " + strNum.length, new String(strNum), end);
+        }
+
+        int result = 0;
+        for (int i = start; i < end; i++) {
+            final char c = strNum[i];
+            if (isDigit(c) == false) {
+                pos.setErrorIndex(i);
+                throw new DateTimeParseException("Character " + c + " is not a digit", new String(strNum), i);
+            }
+            int digit = digit(c);
+            result = result * 10 + digit;
+        }
+        pos.setIndex(end);
+        return result;
+    }
+
+    private static int readIntUnchecked(final char[] strNum, ParsePosition pos, int n) {
+        int start = pos.getIndex(), end = start + n;
+        int result = 0;
+        for (int i = start; i < end; i++) {
+            final char c = strNum[i];
+            int digit = digit(c);
+            result = result * 10 + digit;
+        }
+        pos.setIndex(end);
+        return result;
+    }
+
+    private static int getHour(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static int getMinute(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static int getDay(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static boolean isValidOffset(char[] chars, int offset) {
+        return offset < chars.length;
+    }
+
+    private static void consumeChar(char[] chars, ParsePosition pos, char expected) {
+        int offset = pos.getIndex();
+        if (isValidOffset(chars, offset) == false) {
+            throw new DateTimeParseException("Unexpected end of input", new String(chars), offset);
+        }
+
+        if (chars[offset] != expected) {
+            throw new DateTimeParseException("Expected character " + expected + " at position " + offset, new String(chars), offset);
+        }
+        pos.setIndex(offset + 1);
+    }
+
+    private static void consumeNextChar(char[] chars, ParsePosition pos) {
+        int offset = pos.getIndex();
+        if (isValidOffset(chars, offset) == false) {
+            throw new DateTimeParseException("Unexpected end of input", new String(chars), offset);
+        }
+        pos.setIndex(offset + 1);
+    }
+
+    private static boolean checkPositionContains(char[] chars, ParsePosition pos, char... expected) {
+        int offset = pos.getIndex();
+        if (offset >= chars.length) {
+            throw new DateTimeParseException("Unexpected end of input", new String(chars), offset);
+        }
+
+        boolean found = false;
+        for (char e : expected) {
+            if (chars[offset] == e) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+
+    private static void consumeChar(char[] chars, ParsePosition pos, char... expected) {
+        int offset = pos.getIndex();
+        if (offset >= chars.length) {
+            throw new DateTimeParseException("Unexpected end of input", new String(chars), offset);
+        }
+
+        boolean found = false;
+        for (char e : expected) {
+            if (chars[offset] == e) {
+                found = true;
+                pos.setIndex(offset + 1);
+                break;
+            }
+        }
+        if (!found) {
+            throw new DateTimeParseException(
+                "Expected character " + Arrays.toString(expected) + " at position " + offset,
+                new String(chars),
+                offset
+            );
+        }
+    }
+
+    private static void assertNoMoreChars(char[] chars, ParsePosition pos) {
+        if (chars.length > pos.getIndex()) {
+            throw new DateTimeParseException("Trailing junk data after position " + pos.getIndex(), new String(chars), pos.getIndex());
+        }
+    }
+
+    private static ZoneOffset parseTimezone(char[] chars, ParsePosition pos) {
+        int offset = pos.getIndex();
+        final int left = chars.length - offset;
+        if (checkPositionContains(chars, pos, ZULU_LOWER, ZULU_UPPER)) {
+            consumeNextChar(chars, pos);
+            assertNoMoreChars(chars, pos);
+            return ZoneOffset.UTC;
+        }
+
+        if (left != 6) {
+            throw new DateTimeParseException("Invalid timezone offset", new String(chars, offset, left), offset);
+        }
+
+        final char sign = chars[offset];
+        consumeNextChar(chars, pos);
+        int hours = getHour(chars, pos);
+        consumeChar(chars, pos, TIME_SEPARATOR);
+        int minutes = getMinute(chars, pos);
+        if (sign == MINUS) {
+            if (hours == 0 && minutes == 0) {
+                throw new DateTimeParseException("Unknown 'Local Offset Convention' date-time not allowed", new String(chars), offset);
+            }
+            hours = -hours;
+            minutes = -minutes;
+        } else if (sign != PLUS) {
+            throw new DateTimeParseException("Invalid character starting at position " + offset, new String(chars), offset);
+        }
+
+        return ZoneOffset.ofHoursMinutes(hours, minutes);
+    }
+
+    private static OffsetDateTime handleTime(char[] chars, ParsePosition pos, int year, int month, int day, int hour, int minute) {
+        switch (chars[pos.getIndex()]) {
+            case TIME_SEPARATOR:
+                consumeChar(chars, pos, TIME_SEPARATOR);
+                return handleSeconds(year, month, day, hour, minute, chars, pos);
+
+            case PLUS:
+            case MINUS:
+            case ZULU_UPPER:
+            case ZULU_LOWER:
+                final ZoneOffset zoneOffset = parseTimezone(chars, pos);
+                return OffsetDateTime.of(year, month, day, hour, minute, 0, 0, zoneOffset);
+        }
+        throw new DateTimeParseException("Unexpected character " + " at position " + pos.getIndex(), new String(chars), pos.getIndex());
+    }
+
+    private static int getMonth(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static int getYear(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 4);
+    }
+
+    private static int getSeconds(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static int getFractions(final char[] chars, final ParsePosition pos, final int len) {
+        final int fractions;
+        fractions = readIntUnchecked(chars, pos, len);
+        switch (len) {
+            case 0:
+                throw new DateTimeParseException("Must have at least 1 fraction digit", new String(chars), pos.getIndex());
+            case 1:
+                return fractions * 100_000_000;
+            case 2:
+                return fractions * 10_000_000;
+            case 3:
+                return fractions * 1_000_000;
+            case 4:
+                return fractions * 100_000;
+            case 5:
+                return fractions * 10_000;
+            case 6:
+                return fractions * 1_000;
+            case 7:
+                return fractions * 100;
+            case 8:
+                return fractions * 10;
+            default:
+                return fractions;
+        }
+    }
+
+    public static int indexOfNonDigit(final char[] text, int offset) {
+        for (int i = offset; i < text.length; i++) {
+            if (isDigit(text[i]) == false) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static void consumeDigits(final char[] text, ParsePosition pos) {
+        final int idx = indexOfNonDigit(text, pos.getIndex());
+        if (idx == -1) {
+            pos.setErrorIndex(text.length);
+        } else {
+            pos.setIndex(idx);
+        }
+    }
+
+    private static OffsetDateTime handleSeconds(int year, int month, int day, int hour, int minute, char[] chars, ParsePosition pos) {
+        // From here the specification is more lenient
+        final int seconds = getSeconds(chars, pos);
+        int currPos = pos.getIndex();
+        final int remaining = chars.length - currPos;
+        if (remaining == 0) {
+            // No offset
+            throw new DateTimeParseException("No timezone offset information", new String(chars), pos.getIndex());
+        }
+
+        ZoneOffset offset = null;
+        int fractions = 0;
+        if (remaining == 1 && checkPositionContains(chars, pos, ZULU_LOWER, ZULU_UPPER)) {
+            consumeNextChar(chars, pos);
+            // Do nothing we are done
+            offset = ZoneOffset.UTC;
+            assertNoMoreChars(chars, pos);
+        } else if (remaining >= 1 && checkPositionContains(chars, pos, FRACTION_SEPARATOR_1, FRACTION_SEPARATOR_2)) {
+            // We have fractional seconds;
+            consumeNextChar(chars, pos);
+            ParsePosition initPosition = new ParsePosition(pos.getIndex());
+            consumeDigits(chars, pos);
+            if (pos.getErrorIndex() == -1) {
+                // We have an end of fractions
+                final int len = pos.getIndex() - initPosition.getIndex();
+                fractions = getFractions(chars, initPosition, len);
+                offset = parseTimezone(chars, pos);
+            } else {
+                throw new DateTimeParseException("No timezone offset information", new String(chars), pos.getIndex());
+            }
+        } else if (remaining >= 1 && checkPositionContains(chars, pos, PLUS, MINUS)) {
+            // No fractional sections
+            offset = parseTimezone(chars, pos);
+        } else {
+            throw new DateTimeParseException("Unexpected character at position " + (pos.getIndex()), new String(chars), pos.getIndex());
+        }
+
+        return OffsetDateTime.of(year, month, day, hour, minute, seconds, fractions, offset);
+    }
+}
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 9c1e902606cab..dab99fd25b192 100644
--- a/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
+++ b/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
@@ -164,7 +164,7 @@ public RemoteSegmentMetadata init() throws IOException {
      */
     public RemoteSegmentMetadata initializeToSpecificCommit(long primaryTerm, long commitGeneration, String acquirerId) throws IOException {
         String metadataFilePrefix = MetadataFilenameUtils.getMetadataFilePrefixForCommit(primaryTerm, commitGeneration);
-        String metadataFile = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLock(metadataFilePrefix, acquirerId);
+        String metadataFile = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLockedMetadataFile(metadataFilePrefix, acquirerId);
         RemoteSegmentMetadata remoteSegmentMetadata = readMetadataFile(metadataFile);
         if (remoteSegmentMetadata != null) {
             this.segmentsUploadedToRemoteStore = new ConcurrentHashMap<>(remoteSegmentMetadata.getMetadata());
@@ -749,20 +749,16 @@ public void deleteStaleSegments(int lastNMetadataFilesToKeep) throws IOException
             lastNMetadataFilesToKeep,
             sortedMetadataFileList.size()
         );
-        List<String> metadataFilesToBeDeleted = metadataFilesEligibleToDelete.stream().filter(metadataFile -> {
-            try {
-                return !isLockAcquired(metadataFile);
-            } catch (IOException e) {
-                logger.error(
-                    "skipping metadata file ("
-                        + metadataFile
-                        + ") deletion for this run,"
-                        + " as checking lock for metadata is failing with error: "
-                        + e
-                );
-                return false;
-            }
-        }).collect(Collectors.toList());
+        Set<String> allLockFiles;
+        try {
+            allLockFiles = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLockedMetadataFiles(MetadataFilenameUtils.METADATA_PREFIX);
+        } catch (Exception e) {
+            logger.error("Exception while fetching segment metadata lock files, skipping deleteStaleSegments", e);
+            return;
+        }
+        List<String> metadataFilesToBeDeleted = metadataFilesEligibleToDelete.stream()
+            .filter(metadataFile -> allLockFiles.contains(metadataFile) == false)
+            .collect(Collectors.toList());
 
         sortedMetadataFileList.removeAll(metadataFilesToBeDeleted);
         logger.debug(
diff --git a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
index 5ebd00f59ef49..9c29e03c225e4 100644
--- a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
+++ b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -75,7 +76,7 @@ public void release(LockInfo lockInfo) throws IOException {
         }
     }
 
-    public String fetchLock(String filenamePrefix, String acquirerId) throws IOException {
+    public String fetchLockedMetadataFile(String filenamePrefix, String acquirerId) throws IOException {
         Collection<String> lockFiles = lockDirectory.listFilesByPrefix(filenamePrefix);
         List<String> lockFilesForAcquirer = lockFiles.stream()
             .filter(lockFile -> acquirerId.equals(FileLockInfo.LockFileUtils.getAcquirerIdFromLock(lockFile)))
@@ -88,6 +89,11 @@ public String fetchLock(String filenamePrefix, String acquirerId) throws IOExcep
         return lockFilesForAcquirer.get(0);
     }
 
+    public Set<String> fetchLockedMetadataFiles(String filenamePrefix) throws IOException {
+        Collection<String> lockFiles = lockDirectory.listFilesByPrefix(filenamePrefix);
+        return lockFiles.stream().map(FileLockInfo.LockFileUtils::getFileToLockNameFromLock).collect(Collectors.toSet());
+    }
+
     /**
      * Checks whether a given file have any lock on it or not.
      * @param lockInfo File Lock Info instance for which we need to check if lock is acquired.
diff --git a/server/src/main/java/org/opensearch/snapshots/RestoreService.java b/server/src/main/java/org/opensearch/snapshots/RestoreService.java
index 9d2c7eb882fa1..bf2c7fc74be92 100644
--- a/server/src/main/java/org/opensearch/snapshots/RestoreService.java
+++ b/server/src/main/java/org/opensearch/snapshots/RestoreService.java
@@ -121,6 +121,7 @@
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_VERSION_UPGRADED;
 import static org.opensearch.common.util.FeatureFlags.SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY;
 import static org.opensearch.common.util.set.Sets.newHashSet;
+import static org.opensearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
 import static org.opensearch.index.store.remote.directory.RemoteSnapshotDirectory.SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY_MINIMUM_VERSION;
 import static org.opensearch.index.store.remote.filecache.FileCache.DATA_TO_FILE_CACHE_SIZE_RATIO_SETTING;
 import static org.opensearch.node.Node.NODE_SEARCH_CACHE_SIZE_SETTING;
@@ -226,6 +227,16 @@ public RestoreService(
      */
     public void restoreSnapshot(final RestoreSnapshotRequest request, final ActionListener<RestoreCompletionResponse> listener) {
         try {
+            // Setting INDEX_STORE_TYPE_SETTING as REMOTE_SNAPSHOT is intended to be a system-managed index setting that is configured when
+            // restoring a snapshot and should not be manually set by user.
+            String storeTypeSetting = request.indexSettings().get(INDEX_STORE_TYPE_SETTING.getKey());
+            if (storeTypeSetting != null && storeTypeSetting.equals(RestoreSnapshotRequest.StorageType.REMOTE_SNAPSHOT.toString())) {
+                throw new SnapshotRestoreException(
+                    request.repository(),
+                    request.snapshot(),
+                    "cannot restore remote snapshot with index settings \"index.store.type\" set to \"remote_snapshot\". Instead use \"storage_type\": \"remote_snapshot\" as argument to restore."
+                );
+            }
             // Read snapshot info and metadata from the repository
             final String repositoryName = request.repository();
             Repository repository = repositoriesService.repository(repositoryName);
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 cea151748bfb6..6d1f359d210ac 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
@@ -35,6 +35,7 @@
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.Version;
+import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
 import org.opensearch.action.admin.indices.alias.Alias;
 import org.opensearch.action.admin.indices.create.CreateIndexClusterStateUpdateRequest;
 import org.opensearch.action.admin.indices.shrink.ResizeType;
@@ -133,6 +134,7 @@
 import static org.opensearch.cluster.metadata.MetadataCreateIndexService.getIndexNumberOfRoutingShards;
 import static org.opensearch.cluster.metadata.MetadataCreateIndexService.parseV1Mappings;
 import static org.opensearch.cluster.metadata.MetadataCreateIndexService.resolveAndValidateAliases;
+import static org.opensearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
 import static org.opensearch.index.IndexSettings.INDEX_REFRESH_INTERVAL_SETTING;
 import static org.opensearch.index.IndexSettings.INDEX_REMOTE_TRANSLOG_BUFFER_INTERVAL_SETTING;
 import static org.opensearch.index.IndexSettings.INDEX_SOFT_DELETES_SETTING;
@@ -146,6 +148,7 @@
 import static org.opensearch.node.Node.NODE_ATTRIBUTES;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasKey;
@@ -1936,6 +1939,35 @@ public void testRequestDurabilityWhenRestrictSettingTrue() {
         assertEquals(Translog.Durability.REQUEST, INDEX_TRANSLOG_DURABILITY_SETTING.get(indexSettings));
     }
 
+    public void testIndexCreationWithIndexStoreTypeRemoteStoreThrowsException() {
+        // This checks that aggregateIndexSettings throws exception for the case when the index setting
+        // index.store.type is set to remote_snapshot
+        request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test");
+        final Settings.Builder requestSettings = Settings.builder();
+        requestSettings.put(INDEX_STORE_TYPE_SETTING.getKey(), RestoreSnapshotRequest.StorageType.REMOTE_SNAPSHOT);
+        request.settings(requestSettings.build());
+        final IllegalArgumentException error = expectThrows(
+            IllegalArgumentException.class,
+            () -> aggregateIndexSettings(
+                ClusterState.EMPTY_STATE,
+                request,
+                Settings.EMPTY,
+                null,
+                Settings.EMPTY,
+                IndexScopedSettings.DEFAULT_SCOPED_SETTINGS,
+                randomShardLimitService(),
+                Collections.emptySet(),
+                clusterSettings
+            )
+        );
+        assertThat(
+            error.getMessage(),
+            containsString(
+                "cannot create index with index setting \"index.store.type\" set to \"remote_snapshot\". Store type can be set to \"remote_snapshot\" only when restoring a remote snapshot by using \"storage_type\": \"remote_snapshot\""
+            )
+        );
+    }
+
     private IndexTemplateMetadata addMatchingTemplate(Consumer<IndexTemplateMetadata.Builder> configurator) {
         IndexTemplateMetadata.Builder builder = templateMetadataBuilder("template1", "te*");
         configurator.accept(builder);
diff --git a/server/src/test/java/org/opensearch/cluster/routing/allocation/RemoteShardsBalancerBaseTestCase.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/RemoteShardsBalancerBaseTestCase.java
index a1db6cd83ab6c..6a03a1f79bcde 100644
--- a/server/src/test/java/org/opensearch/cluster/routing/allocation/RemoteShardsBalancerBaseTestCase.java
+++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/RemoteShardsBalancerBaseTestCase.java
@@ -229,6 +229,11 @@ public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, Routing
                     return Decision.ALWAYS;
                 }
             }
+
+            @Override
+            public Decision canAllocateAnyShardToNode(RoutingNode node, RoutingAllocation allocation) {
+                return throttle ? Decision.THROTTLE : Decision.YES;
+            }
         });
         Collections.shuffle(deciders, random());
         return new AllocationDeciders(deciders);
diff --git a/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java b/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java
index e8ddfde11f4cc..4fd8986d0b428 100644
--- a/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java
+++ b/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java
@@ -779,7 +779,9 @@ public void testSamePrinterOutput() {
         DateTime jodaDate = new DateTime(year, month, day, hour, minute, second, DateTimeZone.UTC);
 
         for (FormatNames format : FormatNames.values()) {
-            if (format == FormatNames.ISO8601 || format == FormatNames.STRICT_DATE_OPTIONAL_TIME_NANOS) {
+            if (format == FormatNames.ISO8601
+                || format == FormatNames.STRICT_DATE_OPTIONAL_TIME_NANOS
+                || format == FormatNames.RFC3339_LENIENT) {
                 // Nanos aren't supported by joda
                 continue;
             }
diff --git a/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java b/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java
index 681daf1755890..85c9919275c3a 100644
--- a/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java
+++ b/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java
@@ -249,10 +249,19 @@ public void testEpochSecondParserWithFraction() {
     }
 
     public void testEpochMilliParsersWithDifferentFormatters() {
-        DateFormatter formatter = DateFormatter.forPattern("strict_date_optional_time||epoch_millis");
-        TemporalAccessor accessor = formatter.parse("123");
-        assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(123L));
-        assertThat(formatter.pattern(), is("strict_date_optional_time||epoch_millis"));
+        {
+            DateFormatter formatter = DateFormatter.forPattern("strict_date_optional_time||epoch_millis");
+            TemporalAccessor accessor = formatter.parse("123");
+            assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(123L));
+            assertThat(formatter.pattern(), is("strict_date_optional_time||epoch_millis"));
+        }
+
+        {
+            DateFormatter formatter = DateFormatter.forPattern("rfc3339_lenient||epoch_millis");
+            TemporalAccessor accessor = formatter.parse("123");
+            assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(123L));
+            assertThat(formatter.pattern(), is("rfc3339_lenient||epoch_millis"));
+        }
     }
 
     public void testParsersWithMultipleInternalFormats() throws Exception {
@@ -317,6 +326,11 @@ public void testEqualsAndHashcode() {
         assertThat(epochMillisFormatter.hashCode(), is(DateFormatters.forPattern("epoch_millis").hashCode()));
         assertThat(epochMillisFormatter, sameInstance(DateFormatters.forPattern("epoch_millis")));
         assertThat(epochMillisFormatter, equalTo(DateFormatters.forPattern("epoch_millis")));
+
+        DateFormatter rfc339Formatter = DateFormatters.forPattern("rfc3339_lenient");
+        assertThat(rfc339Formatter.hashCode(), is(DateFormatters.forPattern("rfc3339_lenient").hashCode()));
+        assertThat(rfc339Formatter, sameInstance(DateFormatters.forPattern("rfc3339_lenient")));
+        assertThat(rfc339Formatter, equalTo(DateFormatters.forPattern("rfc3339_lenient")));
     }
 
     public void testSupportBackwardsJava8Format() {
@@ -461,6 +475,132 @@ public void testIso8601Parsing() {
         formatter.format(formatter.parse("2018-05-15T17:14:56,123456789+01:00"));
     }
 
+    public void testRFC3339Parsing() {
+        DateFormatter formatter = DateFormatters.forPattern("rfc3339_lenient");
+
+        // timezone not allowed with just date
+        formatter.format(formatter.parse("2018"));
+        formatter.format(formatter.parse("2018-05"));
+        formatter.format(formatter.parse("2018-05-15"));
+
+        formatter.format(formatter.parse("2018-05-15T17:14Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14z"));
+        formatter.format(formatter.parse("2018-05-15T17:14+01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14-01:00"));
+
+        formatter.format(formatter.parse("2018-05-15T17:14:56Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56+01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56-01:00"));
+
+        // milliseconds can be separated using comma or decimal point
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123-01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123+01:00"));
+
+        // microseconds can be separated using comma or decimal point
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456+01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456-01:00"));
+
+        // nanoseconds can be separated using comma or decimal point
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456789Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456789-01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456789Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456789z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456789+01:00"));
+
+        // 1994-11-05T08:15:30-05:00 corresponds to November 5, 1994, 8:15:30 am, US Eastern Standard Time/
+        // 1994-11-05T13:15:30Z corresponds to the same instant.
+        final Instant instantA = DateFormatters.from(formatter.parse("1994-11-05T08:15:30-05:00")).toInstant();
+        final Instant instantB = DateFormatters.from(formatter.parse("1994-11-05T13:15:30Z")).toInstant();
+        assertThat(instantA, is(instantB));
+
+        // Invalid dates should throw an exception
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("abc"));
+        assertThat(e.getMessage(), is("failed to parse date field [abc] with format [rfc3339_lenient]"));
+        // Invalid offset
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56-00:00"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56-00:00] with format [rfc3339_lenient]"));
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.+00:00"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.+00:00] with format [rfc3339_lenient]"));
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56_00:00"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56_00:00] with format [rfc3339_lenient]"));
+        // No offset
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56] with format [rfc3339_lenient]"));
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.123"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.123] with format [rfc3339_lenient]"));
+        // No end of fraction
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.123"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.123] with format [rfc3339_lenient]"));
+        // Invalid fraction
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.abcZ"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.abcZ] with format [rfc3339_lenient]"));
+        // Invalid date
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("201805-15T17:14:56.123456+0000"));
+        assertThat(e.getMessage(), is("failed to parse date field [201805-15T17:14:56.123456+0000] with format [rfc3339_lenient]"));
+        // More than 9 digits of nanosecond resolution
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.1234567891Z"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.1234567891Z] with format [rfc3339_lenient]"));
+    }
+
+    public void testRFC3339ParserWithDifferentFormatters() {
+        {
+            DateFormatter formatter = DateFormatter.forPattern("strict_date_optional_time||rfc3339_lenient");
+            TemporalAccessor accessor = formatter.parse("2018-05-15T17:14:56+0100");
+            assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(1526400896000L));
+            assertThat(formatter.pattern(), is("strict_date_optional_time||rfc3339_lenient"));
+        }
+
+        {
+            DateFormatter formatter = DateFormatter.forPattern("rfc3339_lenient||strict_date_optional_time");
+            TemporalAccessor accessor = formatter.parse("2018-05-15T17:14:56.123+0100");
+            assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(1526400896123L));
+            assertThat(formatter.pattern(), is("rfc3339_lenient||strict_date_optional_time"));
+        }
+
+        {
+            DateFormatter formatter = DateFormatter.forPattern("rfc3339_lenient||strict_date_optional_time");
+            TemporalAccessor accessor = formatter.parse("2018-05-15T17:14:56.123456789+0100");
+            assertThat(DateFormatters.from(accessor).toInstant().getNano(), is(123456789));
+            assertThat(formatter.pattern(), is("rfc3339_lenient||strict_date_optional_time"));
+        }
+    }
+
+    public void testRFC3339ParserAgainstDifferentFormatters() {
+        DateFormatter rfc3339Formatter = DateFormatter.forPattern("rfc3339_lenient");
+        {
+            DateFormatter isoFormatter = DateFormatter.forPattern("strict_date_optional_time");
+
+            assertDateTimeEquals("2018-05-15T17:14Z", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14-01:00", rfc3339Formatter, isoFormatter);
+
+            assertDateTimeEquals("2018-05-15T17:14:56Z", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56-01:00", rfc3339Formatter, isoFormatter);
+
+            assertDateTimeEquals("2018-05-15T17:14:56.123Z", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56.123+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56.123-01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56,123+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56,123-01:00", rfc3339Formatter, isoFormatter);
+
+            assertDateTimeEquals("2018-05-15T17:14:56.123456Z", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56.123456789+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56.123456789-01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56,123456789+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56,123456789-01:00", rfc3339Formatter, isoFormatter);
+        }
+    }
+
     public void testRoundupFormatterWithEpochDates() {
         assertRoundupFormatter("epoch_millis", "1234567890", 1234567890L);
         // also check nanos of the epoch_millis formatter if it is rounded up to the nano second
@@ -683,4 +823,10 @@ public void testCamelCaseDeprecation() {
             }
         }
     }
+
+    void assertDateTimeEquals(String toTest, DateFormatter candidateParser, DateFormatter baselineParser) {
+        Instant gotInstant = DateFormatters.from(candidateParser.parse(toTest)).toInstant();
+        Instant expectedInstant = DateFormatters.from(baselineParser.parse(toTest)).toInstant();
+        assertThat(gotInstant, is(expectedInstant));
+    }
 }
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 2c6c4afed69fd..7944ee681f5fc 100644
--- a/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
+++ b/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
@@ -988,6 +988,53 @@ public void testDeleteStaleCommitsActualDelete() throws Exception {
         verify(remoteMetadataDirectory).deleteFile(metadataFilename3);
     }
 
+    public void testDeleteStaleCommitsActualDeleteWithLocks() throws Exception {
+        Map<String, Map<String, String>> metadataFilenameContentMapping = populateMetadata();
+        remoteSegmentStoreDirectory.init();
+
+        // Locking one of the metadata files to ensure that it is not getting deleted.
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenReturn(Set.of(metadataFilename2));
+
+        // popluateMetadata() adds stub to return 3 metadata files
+        // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted
+        remoteSegmentStoreDirectory.deleteStaleSegmentsAsync(1);
+
+        for (String metadata : metadataFilenameContentMapping.get(metadataFilename3).values()) {
+            String uploadedFilename = metadata.split(RemoteSegmentStoreDirectory.UploadedSegmentMetadata.SEPARATOR)[1];
+            verify(remoteDataDirectory).deleteFile(uploadedFilename);
+        }
+        assertBusy(() -> assertThat(remoteSegmentStoreDirectory.canDeleteStaleCommits.get(), is(true)));
+        verify(remoteMetadataDirectory).deleteFile(metadataFilename3);
+        verify(remoteMetadataDirectory, times(0)).deleteFile(metadataFilename2);
+    }
+
+    public void testDeleteStaleCommitsNoDeletesDueToLocks() throws Exception {
+        remoteSegmentStoreDirectory.init();
+
+        // Locking all the old metadata files to ensure that none of the segment files are getting deleted.
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenReturn(Set.of(metadataFilename2, metadataFilename3));
+
+        // popluateMetadata() adds stub to return 3 metadata files
+        // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted
+        remoteSegmentStoreDirectory.deleteStaleSegmentsAsync(1);
+
+        assertBusy(() -> assertThat(remoteSegmentStoreDirectory.canDeleteStaleCommits.get(), is(true)));
+        verify(remoteMetadataDirectory, times(0)).deleteFile(any());
+    }
+
+    public void testDeleteStaleCommitsExceptionWhileFetchingLocks() throws Exception {
+        remoteSegmentStoreDirectory.init();
+
+        // Locking one of the metadata files to ensure that it is not getting deleted.
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenThrow(new RuntimeException("Rate limit exceeded"));
+
+        // popluateMetadata() adds stub to return 3 metadata files
+        // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted
+        remoteSegmentStoreDirectory.deleteStaleSegmentsAsync(1);
+
+        verify(remoteMetadataDirectory, times(0)).deleteFile(any());
+    }
+
     public void testDeleteStaleCommitsDeleteDedup() throws Exception {
         Map<String, Map<String, String>> metadataFilenameContentMapping = new HashMap<>(populateMetadata());
         metadataFilenameContentMapping.put(metadataFilename4, metadataFilenameContentMapping.get(metadataFilename3));
diff --git a/server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java b/server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java
index b4eac2c4548d5..299100b65a43e 100644
--- a/server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java
+++ b/server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java
@@ -17,6 +17,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Set;
 
 import junit.framework.TestCase;
 
@@ -96,4 +97,26 @@ public void testIsAcquiredExceptionCase() { // metadata file is not passed durin
         FileLockInfo testLockInfo = FileLockInfo.getLockInfoBuilder().withAcquirerId(testAcquirerId).build();
         assertThrows(IllegalArgumentException.class, () -> remoteStoreMetadataLockManager.isAcquired(testLockInfo));
     }
+
+    public void testFetchLocksEmpty() throws IOException {
+        when(lockDirectory.listFilesByPrefix("metadata")).thenReturn(Set.of());
+        assertEquals(0, remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata").size());
+    }
+
+    public void testFetchLocksNonEmpty() throws IOException {
+        String metadata1 = "metadata_1_2_3";
+        String metadata2 = "metadata_4_5_6";
+        when(lockDirectory.listFilesByPrefix("metadata")).thenReturn(
+            Set.of(
+                FileLockInfo.LockFileUtils.generateLockName(metadata1, "snapshot1"),
+                FileLockInfo.LockFileUtils.generateLockName(metadata2, "snapshot2")
+            )
+        );
+        assertEquals(Set.of(metadata1, metadata2), remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata"));
+    }
+
+    public void testFetchLocksException() throws IOException {
+        when(lockDirectory.listFilesByPrefix("metadata")).thenThrow(new IOException("Something went wrong"));
+        assertThrows(IOException.class, () -> remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata"));
+    }
 }
diff --git a/settings.gradle b/settings.gradle
index 24ab4a7a22237..8fbf32504215b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@
  */
 
 plugins {
-  id "com.gradle.enterprise" version "3.16.1"
+  id "com.gradle.enterprise" version "3.16.2"
 }
 
 ext.disableBuildCache = hasProperty('DISABLE_BUILD_CACHE') || System.getenv().containsKey('DISABLE_BUILD_CACHE')
diff --git a/test/fixtures/minio-fixture/docker-compose.yml b/test/fixtures/minio-fixture/docker-compose.yml
index e4d2faab9a657..539ca9471fa04 100644
--- a/test/fixtures/minio-fixture/docker-compose.yml
+++ b/test/fixtures/minio-fixture/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.2'
 services:
   minio-fixture:
     build:
diff --git a/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java
index 328aaf8a65b1f..59eda7a665d4c 100644
--- a/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java
+++ b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java
@@ -35,6 +35,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.Property;
 import org.apache.logging.log4j.core.filter.RegexFilter;
 import org.opensearch.common.logging.Loggers;
 import org.opensearch.common.regex.Regex;
@@ -68,11 +69,19 @@ public class MockLogAppender extends AbstractAppender implements AutoCloseable {
      * write to a closed MockLogAppender instance.
      */
     public static MockLogAppender createForLoggers(Logger... loggers) throws IllegalAccessException {
-        return createForLoggers(".*(\n.*)*", loggers);
+        final String callingClass = Thread.currentThread().getStackTrace()[2].getClassName();
+        return createForLoggersInternal(callingClass, ".*(\n.*)*", loggers);
     }
 
     public static MockLogAppender createForLoggers(String filter, Logger... loggers) throws IllegalAccessException {
+        final String callingClass = Thread.currentThread().getStackTrace()[2].getClassName();
+        return createForLoggersInternal(callingClass, filter, loggers);
+    }
+
+    private static MockLogAppender createForLoggersInternal(String callingClass, String filter, Logger... loggers)
+        throws IllegalAccessException {
         final MockLogAppender appender = new MockLogAppender(
+            callingClass + "-mock-log-appender",
             RegexFilter.createFilter(filter, new String[0], false, null, null),
             Collections.unmodifiableList(Arrays.asList(loggers))
         );
@@ -83,8 +92,8 @@ public static MockLogAppender createForLoggers(String filter, Logger... loggers)
         return appender;
     }
 
-    private MockLogAppender(RegexFilter filter, List<Logger> loggers) {
-        super("mock", filter, null);
+    private MockLogAppender(String name, RegexFilter filter, List<Logger> loggers) {
+        super(name, filter, null, true, Property.EMPTY_ARRAY);
         /*
          * We use a copy-on-write array list since log messages could be appended while we are setting up expectations. When that occurs,
          * we would run into a concurrent modification exception from the iteration over the expectations in #append, concurrent with a
@@ -116,7 +125,14 @@ public void close() {
         for (Logger logger : loggers) {
             Loggers.removeAppender(logger, this);
         }
-        this.stop();
+        super.stop();
+    }
+
+    @Override
+    public void stop() {
+        // MockLogAppender should be used with try-with-resources to ensure
+        // proper clean up ordering and should never be stopped directly.
+        throw new UnsupportedOperationException("Use close() to ensure proper clean up ordering");
     }
 
     public interface LoggingExpectation {
diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchTestClusterRule.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestClusterRule.java
index dcdca8ab35dfc..57e9ccf22ab43 100644
--- a/test/framework/src/main/java/org/opensearch/test/OpenSearchTestClusterRule.java
+++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestClusterRule.java
@@ -56,6 +56,8 @@
  * on the way cluster settings are being managed.
  */
 class OpenSearchTestClusterRule implements MethodRule {
+    // Maps each TestCluster instance to the exact test suite instance that triggered its creation
+    private final Map<TestCluster, OpenSearchIntegTestCase> suites = new IdentityHashMap<>();
     private final Map<Class<?>, TestCluster> clusters = new IdentityHashMap<>();
     private final Logger logger = LogManager.getLogger(getClass());
 
@@ -86,7 +88,13 @@ void afterClass() throws Exception {
                 printTestMessage("cleaning up after");
                 afterInternal(true, null);
                 OpenSearchTestCase.checkStaticState(true);
-                clusters.remove(getTestClass());
+                synchronized (clusters) {
+                    final TestCluster cluster = clusters.remove(getTestClass());
+                    IOUtils.closeWhileHandlingException(cluster);
+                    if (cluster != null) {
+                        suites.remove(cluster);
+                    }
+                }
             }
             StrictCheckSpanProcessor.validateTracingStateOnShutdown();
         } finally {
@@ -226,8 +234,11 @@ private static boolean isSuiteScopedTest(Class<?> clazz) {
         return clazz.getAnnotation(SuiteScopeTestCase.class) != null;
     }
 
-    private boolean hasParametersChanged(final ParameterizedOpenSearchIntegTestCase target) {
-        return !((ParameterizedOpenSearchIntegTestCase) suiteInstance).hasSameParametersAs(target);
+    private static boolean hasParametersChanged(
+        final ParameterizedOpenSearchIntegTestCase instance,
+        final ParameterizedOpenSearchIntegTestCase target
+    ) {
+        return !instance.hasSameParametersAs(target);
     }
 
     private boolean runTestScopeLifecycle() {
@@ -242,8 +253,24 @@ private TestCluster buildAndPutCluster(Scope currentClusterScope, long seed, Ope
             clearClusters(); // all leftovers are gone by now... this is really just a double safety if we miss something somewhere
             switch (currentClusterScope) {
                 case SUITE:
+                    if (testCluster != null && target instanceof ParameterizedOpenSearchIntegTestCase) {
+                        final OpenSearchIntegTestCase instance = suites.get(testCluster);
+                        if (instance != null) {
+                            assert instance instanceof ParameterizedOpenSearchIntegTestCase;
+                            if (hasParametersChanged(
+                                (ParameterizedOpenSearchIntegTestCase) instance,
+                                (ParameterizedOpenSearchIntegTestCase) target
+                            )) {
+                                IOUtils.closeWhileHandlingException(testCluster);
+                                printTestMessage("new instance of parameterized test class, recreating test cluster for suite");
+                                testCluster = null;
+                            }
+                        }
+                    }
+
                     if (testCluster == null) { // only build if it's not there yet
                         testCluster = buildWithPrivateContext(currentClusterScope, seed, target);
+                        suites.put(testCluster, target);
                     }
                     break;
                 case TEST:
@@ -310,6 +337,7 @@ private void clearClusters() throws Exception {
         synchronized (clusters) {
             if (!clusters.isEmpty()) {
                 IOUtils.close(clusters.values());
+                suites.clear();
                 clusters.clear();
             }
         }
@@ -363,7 +391,10 @@ private void initializeSuiteScope(OpenSearchIntegTestCase target, FrameworkMetho
             // Catching the case when parameterized test cases are run: the test class stays the same but the test instances changes.
             if (target instanceof ParameterizedOpenSearchIntegTestCase) {
                 assert suiteInstance instanceof ParameterizedOpenSearchIntegTestCase;
-                if (hasParametersChanged((ParameterizedOpenSearchIntegTestCase) target)) {
+                if (hasParametersChanged(
+                    (ParameterizedOpenSearchIntegTestCase) suiteInstance,
+                    (ParameterizedOpenSearchIntegTestCase) target
+                )) {
                     printTestMessage("new instance of parameterized test class, recreating cluster scope", method);
                     afterClass();
                     beforeClass();
diff --git a/test/framework/src/test/java/org/opensearch/test/ParameterizedDynamicSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/ParameterizedDynamicSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..4b864d820d9ec
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/ParameterizedDynamicSettingsOpenSearchIntegTests.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.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+public class ParameterizedDynamicSettingsOpenSearchIntegTests extends ParameterizedDynamicSettingsOpenSearchIntegTestCase {
+    public ParameterizedDynamicSettingsOpenSearchIntegTests(Settings dynamicSettings) {
+        super(dynamicSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final ClusterStateResponse cluster = client().admin().cluster().prepareState().all().get();
+        assertThat(
+            CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(cluster.getState().getMetadata().settings()),
+            equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+        );
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/ParameterizedStaticSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/ParameterizedStaticSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..76e05d55a854b
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/ParameterizedStaticSettingsOpenSearchIntegTests.java
@@ -0,0 +1,53 @@
+/*
+ * 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.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.node.info.NodeInfo;
+import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+public class ParameterizedStaticSettingsOpenSearchIntegTests extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
+
+    public ParameterizedStaticSettingsOpenSearchIntegTests(Settings staticSettings) {
+        super(staticSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final NodesInfoResponse nodes = client().admin().cluster().prepareNodesInfo().get();
+        for (final NodeInfo node : nodes.getNodes()) {
+            assertThat(
+                CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(node.getSettings()),
+                equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+            );
+        }
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..e96eaec6e85a3
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
@@ -0,0 +1,50 @@
+/*
+ * 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.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+@OpenSearchIntegTestCase.SuiteScopeTestCase
+public class SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests extends ParameterizedDynamicSettingsOpenSearchIntegTestCase {
+    public SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests(Settings dynamicSettings) {
+        super(dynamicSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final ClusterStateResponse cluster = client().admin().cluster().prepareState().all().get();
+        assertThat(
+            CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(cluster.getState().getMetadata().settings()),
+            equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+        );
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..093be04d556b0
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests.java
@@ -0,0 +1,53 @@
+/*
+ * 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.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.node.info.NodeInfo;
+import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+@OpenSearchIntegTestCase.SuiteScopeTestCase
+public class SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
+    public SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests(Settings staticSettings) {
+        super(staticSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final NodesInfoResponse nodes = client().admin().cluster().prepareNodesInfo().get();
+        for (final NodeInfo node : nodes.getNodes()) {
+            assertThat(
+                CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(node.getSettings()),
+                equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+            );
+        }
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedDynamicSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..bd271b93ba674
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
@@ -0,0 +1,50 @@
+/*
+ * 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.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST)
+public class TestScopedParameterizedDynamicSettingsOpenSearchIntegTests extends ParameterizedDynamicSettingsOpenSearchIntegTestCase {
+    public TestScopedParameterizedDynamicSettingsOpenSearchIntegTests(Settings dynamicSettings) {
+        super(dynamicSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final ClusterStateResponse cluster = client().admin().cluster().prepareState().all().get();
+        assertThat(
+            CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(cluster.getState().getMetadata().settings()),
+            equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+        );
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedStaticSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedStaticSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..014f96657ba03
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedStaticSettingsOpenSearchIntegTests.java
@@ -0,0 +1,53 @@
+/*
+ * 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.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.node.info.NodeInfo;
+import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST)
+public class TestScopedParameterizedStaticSettingsOpenSearchIntegTests extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
+    public TestScopedParameterizedStaticSettingsOpenSearchIntegTests(Settings staticSettings) {
+        super(staticSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final NodesInfoResponse nodes = client().admin().cluster().prepareNodesInfo().get();
+        for (final NodeInfo node : nodes.getNodes()) {
+            assertThat(
+                CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(node.getSettings()),
+                equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+            );
+        }
+    }
+}