diff --git a/CHANGELOG.md b/CHANGELOG.md
index a60786b7cbcd7..b8ab06ce681b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,11 +103,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased 2.x]
 ### Added
+- Add a counter to node stat api to track shard going from idle to non-idle ([#12768](https://github.com/opensearch-project/OpenSearch/pull/12768))
 
 ### Dependencies
 - Bump `org.apache.commons:commons-configuration2` from 2.10.0 to 2.10.1 ([#12896](https://github.com/opensearch-project/OpenSearch/pull/12896))
 - Bump `asm` from 9.6 to 9.7 ([#12908](https://github.com/opensearch-project/OpenSearch/pull/12908))
 - Bump `net.minidev:json-smart` from 2.5.0 to 2.5.1 ([#12893](https://github.com/opensearch-project/OpenSearch/pull/12893))
+- Bump `netty` from 4.1.107.Final to 4.1.108.Final ([#12924](https://github.com/opensearch-project/OpenSearch/pull/12924))
 
 ### Changed
 - [BWC and API enforcement] Enforcing the presence of API annotations at build time ([#12872](https://github.com/opensearch-project/OpenSearch/pull/12872))
@@ -122,4 +124,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Security
 
 [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD
-[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.12...2.x
+[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.13...2.x
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 2a9fdb7cdddaf..5c9cd25bb79ad 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -26,7 +26,7 @@ jakarta_annotation = 1.3.5
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.13.0
 
-netty             = 4.1.107.Final
+netty             = 4.1.108.Final
 joda              = 2.12.2
 
 # project reactor
diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java
index 3259ba85ef340..b53ce2db994a8 100644
--- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java
+++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java
@@ -24,7 +24,7 @@ public class CopyProcessorTests extends OpenSearchTestCase {
     public void testCopyExistingField() throws Exception {
         IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
         String sourceFieldName = RandomDocumentPicks.randomExistingFieldName(random(), ingestDocument);
-        String targetFieldName = RandomDocumentPicks.randomFieldName(random());
+        String targetFieldName = RandomDocumentPicks.randomNonExistingFieldName(random(), ingestDocument);
         Processor processor = createCopyProcessor(sourceFieldName, targetFieldName, false, false, false);
         processor.execute(ingestDocument);
         assertThat(ingestDocument.hasField(targetFieldName), equalTo(true));
@@ -71,7 +71,8 @@ public void testCopyWithIgnoreMissing() throws Exception {
     public void testCopyWithRemoveSource() throws Exception {
         IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
         String sourceFieldName = RandomDocumentPicks.randomExistingFieldName(random(), ingestDocument);
-        String targetFieldName = RandomDocumentPicks.randomFieldName(random());
+        String targetFieldName = RandomDocumentPicks.randomNonExistingFieldName(random(), ingestDocument);
+
         Object sourceValue = ingestDocument.getFieldValue(sourceFieldName, Object.class);
 
         Processor processor = createCopyProcessor(sourceFieldName, targetFieldName, false, true, false);
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.107.Final.jar.sha1
deleted file mode 100644
index beb44fc0f4cf9..0000000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8509a72b8a5a2d33d611e99254aed39765c3ad82
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..1021bfbec06ad
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+2a9d06026ed251705e6ab52fa6ebe5f4f15aab7a
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.107.Final.jar.sha1
deleted file mode 100644
index 4c74bb06fd83b..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0a1d32debf2ed07c5852ab5b2904c43adb76c39e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..28bef74acca6d
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+c2ef6018eecde345fcddb96e31f651df16dca4c2
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.107.Final.jar.sha1
deleted file mode 100644
index 38eb2e5bad80a..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04d8e9e51b7254bd26a42fe17bdcae32e4c6ebb3
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..82fb94debd45d
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+dd44733e94f3f6237c896f2bbe9927c1eba48543
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.107.Final.jar.sha1
deleted file mode 100644
index 5b3d3311edc9f..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http2-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3885ffe7dd05c9773df70c61009f34a5a8a383ec
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..018cf546ca622
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http2-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+ed90430e545529a2df7c1db6c94568ea00867a61
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.107.Final.jar.sha1
deleted file mode 100644
index bbe91c6ccfb1d..0000000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f17a547530d64becd7179507b25f4154bcfba57
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..0f459553b16e0
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+30617b39cc6f850ca3807459fe726fbcd63989f2
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.107.Final.jar.sha1
deleted file mode 100644
index ba27b38632622..0000000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4c6b05f4d9aca117981297fb7f02953102ebb5e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..854891ce4dafe
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+d186a0be320e6a139c42d9b018596ef9d4a0b4ca
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.107.Final.jar.sha1
deleted file mode 100644
index 3bc0f7b3fed09..0000000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfee84308341a42131dd0f8ac0e1e02d627c19f3
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..3a95ebfdbe6a1
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+f3085568e45c2ca74118118f792d0d55968aeb13
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.107.Final.jar.sha1
deleted file mode 100644
index 19419999300dd..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6a105c621b47d1410e0e09419d7209d2d46e914
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..d1e2ada6f8c84
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+1fd80f714c85ca685a80f32e0a4e8fd3b866e310
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1
deleted file mode 100644
index 407ecaffdad30..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d61d4959741109b3eccd7337f11fc89fa90a74a
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..978378686b4ad
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+0df31f1cd96df8b2882b1e0faf4409b0bd704541
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.107.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.107.Final.jar.sha1
deleted file mode 100644
index d823de7ffadd4..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-dns-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-945e8ad5ab7ec4f11fb0257d2594af0cfae1d4b7
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.108.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..93207338f7db8
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+93cc78652ed836ef950604139bfb4afb45e0bc7b
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.107.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.107.Final.jar.sha1
deleted file mode 100644
index 5b3d3311edc9f..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3885ffe7dd05c9773df70c61009f34a5a8a383ec
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.108.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..018cf546ca622
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+ed90430e545529a2df7c1db6c94568ea00867a61
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.107.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.107.Final.jar.sha1
deleted file mode 100644
index 114d77a1bb95f..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b7070e9acfe262bb0bd936c4051116631796b3b
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.108.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..e850aad5f3656
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+3ad0af28e408092f0d12994802a9f3fe18d45f8c
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.107.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.107.Final.jar.sha1
deleted file mode 100644
index 5a4bde479eb38..0000000000000
--- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ebc495e9b2bc2c9ab60a264b40f62dc0671d9f6e
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.108.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..d4ae1b7e71661
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+62b6a5dfee2e22ab9015a469cb68e4727596fd4c
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.107.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.107.Final.jar.sha1
deleted file mode 100644
index a62cb0fefcc40..0000000000000
--- a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d655d09e972dee46f580dbcf41c0d1356aea9e1b
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.108.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..8d299e265646d
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+84d160a3b20f1de896df0cfafe6638199d49efb8
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1
deleted file mode 100644
index 407ecaffdad30..0000000000000
--- a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d61d4959741109b3eccd7337f11fc89fa90a74a
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..978378686b4ad
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+0df31f1cd96df8b2882b1e0faf4409b0bd704541
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.107.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.107.Final.jar.sha1
deleted file mode 100644
index 0e3595fecb0d2..0000000000000
--- a/plugins/repository-hdfs/licenses/netty-all-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3019703b67413ef3d6150da1f49753f4010507ce
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.108.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..5f0eed9c5d7e4
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/netty-all-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+ad97680373f9c9f278f597ad6552d44e20418929
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.107.Final.jar.sha1
deleted file mode 100644
index beb44fc0f4cf9..0000000000000
--- a/plugins/repository-s3/licenses/netty-buffer-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8509a72b8a5a2d33d611e99254aed39765c3ad82
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..1021bfbec06ad
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-buffer-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+2a9d06026ed251705e6ab52fa6ebe5f4f15aab7a
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.107.Final.jar.sha1
deleted file mode 100644
index 4c74bb06fd83b..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0a1d32debf2ed07c5852ab5b2904c43adb76c39e
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..28bef74acca6d
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+c2ef6018eecde345fcddb96e31f651df16dca4c2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.107.Final.jar.sha1
deleted file mode 100644
index 38eb2e5bad80a..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-http-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04d8e9e51b7254bd26a42fe17bdcae32e4c6ebb3
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..82fb94debd45d
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-http-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+dd44733e94f3f6237c896f2bbe9927c1eba48543
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.107.Final.jar.sha1
deleted file mode 100644
index 5b3d3311edc9f..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-http2-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3885ffe7dd05c9773df70c61009f34a5a8a383ec
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..018cf546ca622
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-http2-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+ed90430e545529a2df7c1db6c94568ea00867a61
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.107.Final.jar.sha1
deleted file mode 100644
index bbe91c6ccfb1d..0000000000000
--- a/plugins/repository-s3/licenses/netty-common-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f17a547530d64becd7179507b25f4154bcfba57
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..0f459553b16e0
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-common-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+30617b39cc6f850ca3807459fe726fbcd63989f2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.107.Final.jar.sha1
deleted file mode 100644
index ba27b38632622..0000000000000
--- a/plugins/repository-s3/licenses/netty-handler-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4c6b05f4d9aca117981297fb7f02953102ebb5e
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..854891ce4dafe
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-handler-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+d186a0be320e6a139c42d9b018596ef9d4a0b4ca
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.107.Final.jar.sha1
deleted file mode 100644
index 3bc0f7b3fed09..0000000000000
--- a/plugins/repository-s3/licenses/netty-resolver-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfee84308341a42131dd0f8ac0e1e02d627c19f3
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..3a95ebfdbe6a1
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-resolver-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+f3085568e45c2ca74118118f792d0d55968aeb13
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.107.Final.jar.sha1
deleted file mode 100644
index 19419999300dd..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6a105c621b47d1410e0e09419d7209d2d46e914
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..d1e2ada6f8c84
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+1fd80f714c85ca685a80f32e0a4e8fd3b866e310
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.107.Final.jar.sha1
deleted file mode 100644
index 6b9a35acb2c20..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9234407d6a46745599735765c4d3755c7fc84162
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..6ed00ff79dea9
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+baf7b939ef71b25713cacbe47bef8caf80ce99c6
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1
deleted file mode 100644
index 407ecaffdad30..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d61d4959741109b3eccd7337f11fc89fa90a74a
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..978378686b4ad
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+0df31f1cd96df8b2882b1e0faf4409b0bd704541
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.107.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.107.Final.jar.sha1
deleted file mode 100644
index beb44fc0f4cf9..0000000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8509a72b8a5a2d33d611e99254aed39765c3ad82
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.108.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..1021bfbec06ad
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+2a9d06026ed251705e6ab52fa6ebe5f4f15aab7a
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.107.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.107.Final.jar.sha1
deleted file mode 100644
index 4c74bb06fd83b..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0a1d32debf2ed07c5852ab5b2904c43adb76c39e
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.108.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..28bef74acca6d
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+c2ef6018eecde345fcddb96e31f651df16dca4c2
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.107.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.107.Final.jar.sha1
deleted file mode 100644
index 38eb2e5bad80a..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04d8e9e51b7254bd26a42fe17bdcae32e4c6ebb3
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.108.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..82fb94debd45d
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+dd44733e94f3f6237c896f2bbe9927c1eba48543
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.107.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.107.Final.jar.sha1
deleted file mode 100644
index bbe91c6ccfb1d..0000000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f17a547530d64becd7179507b25f4154bcfba57
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.108.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..0f459553b16e0
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+30617b39cc6f850ca3807459fe726fbcd63989f2
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.107.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.107.Final.jar.sha1
deleted file mode 100644
index ba27b38632622..0000000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4c6b05f4d9aca117981297fb7f02953102ebb5e
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.108.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..854891ce4dafe
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+d186a0be320e6a139c42d9b018596ef9d4a0b4ca
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.107.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.107.Final.jar.sha1
deleted file mode 100644
index 3bc0f7b3fed09..0000000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfee84308341a42131dd0f8ac0e1e02d627c19f3
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.108.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..3a95ebfdbe6a1
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+f3085568e45c2ca74118118f792d0d55968aeb13
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.107.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.107.Final.jar.sha1
deleted file mode 100644
index 19419999300dd..0000000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6a105c621b47d1410e0e09419d7209d2d46e914
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.108.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..d1e2ada6f8c84
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+1fd80f714c85ca685a80f32e0a4e8fd3b866e310
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.107.Final.jar.sha1
deleted file mode 100644
index beb44fc0f4cf9..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8509a72b8a5a2d33d611e99254aed39765c3ad82
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..1021bfbec06ad
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+2a9d06026ed251705e6ab52fa6ebe5f4f15aab7a
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.107.Final.jar.sha1
deleted file mode 100644
index 4c74bb06fd83b..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0a1d32debf2ed07c5852ab5b2904c43adb76c39e
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..28bef74acca6d
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+c2ef6018eecde345fcddb96e31f651df16dca4c2
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.107.Final.jar.sha1
deleted file mode 100644
index d823de7ffadd4..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-945e8ad5ab7ec4f11fb0257d2594af0cfae1d4b7
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..93207338f7db8
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+93cc78652ed836ef950604139bfb4afb45e0bc7b
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.107.Final.jar.sha1
deleted file mode 100644
index 38eb2e5bad80a..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-04d8e9e51b7254bd26a42fe17bdcae32e4c6ebb3
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..82fb94debd45d
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+dd44733e94f3f6237c896f2bbe9927c1eba48543
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.107.Final.jar.sha1
deleted file mode 100644
index 5b3d3311edc9f..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3885ffe7dd05c9773df70c61009f34a5a8a383ec
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..018cf546ca622
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+ed90430e545529a2df7c1db6c94568ea00867a61
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.107.Final.jar.sha1
deleted file mode 100644
index bbe91c6ccfb1d..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4f17a547530d64becd7179507b25f4154bcfba57
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..0f459553b16e0
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+30617b39cc6f850ca3807459fe726fbcd63989f2
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.107.Final.jar.sha1
deleted file mode 100644
index ba27b38632622..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4c6b05f4d9aca117981297fb7f02953102ebb5e
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..854891ce4dafe
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+d186a0be320e6a139c42d9b018596ef9d4a0b4ca
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.107.Final.jar.sha1
deleted file mode 100644
index 3bc0f7b3fed09..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfee84308341a42131dd0f8ac0e1e02d627c19f3
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..3a95ebfdbe6a1
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+f3085568e45c2ca74118118f792d0d55968aeb13
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.107.Final.jar.sha1
deleted file mode 100644
index a62cb0fefcc40..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d655d09e972dee46f580dbcf41c0d1356aea9e1b
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..8d299e265646d
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+84d160a3b20f1de896df0cfafe6638199d49efb8
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.107.Final.jar.sha1
deleted file mode 100644
index 19419999300dd..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d6a105c621b47d1410e0e09419d7209d2d46e914
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..d1e2ada6f8c84
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+1fd80f714c85ca685a80f32e0a4e8fd3b866e310
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1
deleted file mode 100644
index 407ecaffdad30..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.107.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d61d4959741109b3eccd7337f11fc89fa90a74a
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1
new file mode 100644
index 0000000000000..978378686b4ad
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.108.Final.jar.sha1
@@ -0,0 +1 @@
+0df31f1cd96df8b2882b1e0faf4409b0bd704541
\ No newline at end of file
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
index 29fbf55417961..c309f19b454e7 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
@@ -1,13 +1,108 @@
 "Help":
   - skip:
-      version: " - 2.11.99"
+      version: " - 2.99.99"
+      reason:  search idle reactivate count total is only added in 3.0.0
+      features: node_selector
+  - do:
+      cat.shards:
+        help: true
+      node_selector:
+        version: "3.0.0 - "
+
+  - match:
+      $body: |
+        /^   index                            .+   \n
+             shard                            .+   \n
+             prirep                           .+   \n
+             state                            .+   \n
+             docs                             .+   \n
+             store                            .+   \n
+             ip                               .+   \n
+             id                               .+   \n
+             node                             .+   \n
+             sync_id                          .+   \n
+             unassigned.reason                .+   \n
+             unassigned.at                    .+   \n
+             unassigned.for                   .+   \n
+             unassigned.details               .+   \n
+             recoverysource.type              .+   \n
+             completion.size                  .+   \n
+             fielddata.memory_size            .+   \n
+             fielddata.evictions              .+   \n
+             query_cache.memory_size          .+   \n
+             query_cache.evictions            .+   \n
+             flush.total                      .+   \n
+             flush.total_time                 .+   \n
+             get.current                      .+   \n
+             get.time                         .+   \n
+             get.total                        .+   \n
+             get.exists_time                  .+   \n
+             get.exists_total                 .+   \n
+             get.missing_time                 .+   \n
+             get.missing_total                .+   \n
+             indexing.delete_current          .+   \n
+             indexing.delete_time             .+   \n
+             indexing.delete_total            .+   \n
+             indexing.index_current           .+   \n
+             indexing.index_time              .+   \n
+             indexing.index_total             .+   \n
+             indexing.index_failed            .+   \n
+             merges.current                   .+   \n
+             merges.current_docs              .+   \n
+             merges.current_size              .+   \n
+             merges.total                     .+   \n
+             merges.total_docs                .+   \n
+             merges.total_size                .+   \n
+             merges.total_time                .+   \n
+             refresh.total                    .+   \n
+             refresh.time                     .+   \n
+             refresh.external_total           .+   \n
+             refresh.external_time            .+   \n
+             refresh.listeners                .+   \n
+             search.fetch_current             .+   \n
+             search.fetch_time                .+   \n
+             search.fetch_total               .+   \n
+             search.open_contexts             .+   \n
+             search.query_current             .+   \n
+             search.query_time                .+   \n
+             search.query_total               .+   \n
+             search.concurrent_query_current  .+   \n
+             search.concurrent_query_time     .+   \n
+             search.concurrent_query_total    .+   \n
+             search.concurrent_avg_slice_count  .+   \n
+             search.scroll_current            .+   \n
+             search.scroll_time               .+   \n
+             search.scroll_total              .+   \n
+             search.point_in_time_current     .+   \n
+             search.point_in_time_time        .+   \n
+             search.point_in_time_total       .+   \n
+             search.search_idle_reactivate_count_total  .+   \n
+             segments.count                   .+   \n
+             segments.memory                  .+   \n
+             segments.index_writer_memory     .+   \n
+             segments.version_map_memory      .+   \n
+             segments.fixed_bitset_memory     .+   \n
+             seq_no.max                       .+   \n
+             seq_no.local_checkpoint          .+   \n
+             seq_no.global_checkpoint         .+   \n
+             warmer.current                   .+   \n
+             warmer.total                     .+   \n
+             warmer.total_time                .+   \n
+             path.data                        .+   \n
+             path.state                       .+   \n
+             docs.deleted                     .+   \n
+        $/
+---
+"Help from 2.12.0 to 2.99.99":
+  - skip:
+      version: " - 2.11.99 , 3.0.0 - "
       reason:  deleted docs and concurrent search are added in 2.12.0
       features: node_selector
   - do:
       cat.shards:
         help: true
       node_selector:
-        version: "2.12.0 - "
+        version: "2.12.0 - 2.99.99"
 
   - match:
       $body: |
diff --git a/server/src/main/java/org/opensearch/index/search/stats/SearchStats.java b/server/src/main/java/org/opensearch/index/search/stats/SearchStats.java
index 576e00f8f30d1..d3a53fcc0e2d8 100644
--- a/server/src/main/java/org/opensearch/index/search/stats/SearchStats.java
+++ b/server/src/main/java/org/opensearch/index/search/stats/SearchStats.java
@@ -163,6 +163,8 @@ public static class Stats implements Writeable, ToXContentFragment {
         private long pitTimeInMillis;
         private long pitCurrent;
 
+        private long searchIdleReactivateCount;
+
         @Nullable
         private RequestStatsLongHolder requestStatsLongHolder;
 
@@ -193,7 +195,8 @@ public Stats(
             long pitCurrent,
             long suggestCount,
             long suggestTimeInMillis,
-            long suggestCurrent
+            long suggestCurrent,
+            long searchIdleReactivateCount
         ) {
             this.requestStatsLongHolder = new RequestStatsLongHolder();
             this.queryCount = queryCount;
@@ -220,6 +223,8 @@ public Stats(
             this.pitCount = pitCount;
             this.pitTimeInMillis = pitTimeInMillis;
             this.pitCurrent = pitCurrent;
+
+            this.searchIdleReactivateCount = searchIdleReactivateCount;
         }
 
         private Stats(StreamInput in) throws IOException {
@@ -255,6 +260,10 @@ private Stats(StreamInput in) throws IOException {
                 concurrentQueryCurrent = in.readVLong();
                 queryConcurrency = in.readVLong();
             }
+
+            if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+                searchIdleReactivateCount = in.readVLong();
+            }
         }
 
         public void add(Stats stats) {
@@ -282,6 +291,8 @@ public void add(Stats stats) {
             pitCount += stats.pitCount;
             pitTimeInMillis += stats.pitTimeInMillis;
             pitCurrent += stats.pitCurrent;
+
+            searchIdleReactivateCount += stats.searchIdleReactivateCount;
         }
 
         public void addForClosingShard(Stats stats) {
@@ -306,6 +317,8 @@ public void addForClosingShard(Stats stats) {
             pitTimeInMillis += stats.pitTimeInMillis;
             pitCurrent += stats.pitCurrent;
             queryConcurrency += stats.queryConcurrency;
+
+            searchIdleReactivateCount += stats.searchIdleReactivateCount;
         }
 
         public long getQueryCount() {
@@ -412,6 +425,10 @@ public long getSuggestCurrent() {
             return suggestCurrent;
         }
 
+        public long getSearchIdleReactivateCount() {
+            return searchIdleReactivateCount;
+        }
+
         public static Stats readStats(StreamInput in) throws IOException {
             return new Stats(in);
         }
@@ -457,6 +474,10 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeVLong(concurrentQueryCurrent);
                 out.writeVLong(queryConcurrency);
             }
+
+            if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+                out.writeVLong(searchIdleReactivateCount);
+            }
         }
 
         @Override
@@ -486,6 +507,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.humanReadableField(Fields.SUGGEST_TIME_IN_MILLIS, Fields.SUGGEST_TIME, getSuggestTime());
             builder.field(Fields.SUGGEST_CURRENT, suggestCurrent);
 
+            builder.field(Fields.SEARCH_IDLE_REACTIVATE_COUNT_TOTAL, searchIdleReactivateCount);
+
             if (requestStatsLongHolder != null) {
                 builder.startObject(Fields.REQUEST);
 
@@ -654,6 +677,7 @@ static final class Fields {
         static final String TIME = "time";
         static final String CURRENT = "current";
         static final String TOTAL = "total";
+        static final String SEARCH_IDLE_REACTIVATE_COUNT_TOTAL = "search_idle_reactivate_count_total";
 
     }
 
diff --git a/server/src/main/java/org/opensearch/index/search/stats/ShardSearchStats.java b/server/src/main/java/org/opensearch/index/search/stats/ShardSearchStats.java
index 99e3f8465c5db..3098986852cc1 100644
--- a/server/src/main/java/org/opensearch/index/search/stats/ShardSearchStats.java
+++ b/server/src/main/java/org/opensearch/index/search/stats/ShardSearchStats.java
@@ -213,6 +213,11 @@ public void onFreePitContext(ReaderContext readerContext) {
         totalStats.pitMetric.inc(TimeUnit.NANOSECONDS.toMicros(System.nanoTime() - readerContext.getStartTimeInNano()));
     }
 
+    @Override
+    public void onSearchIdleReactivation() {
+        totalStats.searchIdleMetric.inc();
+    }
+
     /**
      * Holder of statistics values
      *
@@ -239,6 +244,7 @@ static final class StatsHolder {
         final CounterMetric scrollCurrent = new CounterMetric();
         final CounterMetric pitCurrent = new CounterMetric();
         final CounterMetric suggestCurrent = new CounterMetric();
+        final CounterMetric searchIdleMetric = new CounterMetric();
 
         SearchStats.Stats stats() {
             return new SearchStats.Stats(
@@ -260,7 +266,8 @@ SearchStats.Stats stats() {
                 pitCurrent.count(),
                 suggestMetric.count(),
                 TimeUnit.NANOSECONDS.toMillis(suggestMetric.sum()),
-                suggestCurrent.count()
+                suggestCurrent.count(),
+                searchIdleMetric.count()
             );
         }
     }
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
index 1d7aa6ac4958b..551dd338eed2a 100644
--- a/server/src/main/java/org/opensearch/index/shard/IndexShard.java
+++ b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -4683,9 +4683,14 @@ public void afterRefresh(boolean didRefresh) {
      *                 <code>true</code> if the listener was registered to wait for a refresh.
      */
     public final void awaitShardSearchActive(Consumer<Boolean> listener) {
+        boolean isSearchIdle = isSearchIdle();
         markSearcherAccessed(); // move the shard into non-search idle
         final Translog.Location location = pendingRefreshLocation.get();
         if (location != null) {
+            if (isSearchIdle) {
+                SearchOperationListener searchOperationListener = getSearchOperationListener();
+                searchOperationListener.onSearchIdleReactivation();
+            }
             addRefreshListener(location, (b) -> {
                 pendingRefreshLocation.compareAndSet(location, null);
                 listener.accept(true);
diff --git a/server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java b/server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java
index 849a4f9c15318..94079db468f9c 100644
--- a/server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java
+++ b/server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java
@@ -145,6 +145,11 @@ default void onNewPitContext(ReaderContext readerContext) {}
      */
     default void onFreePitContext(ReaderContext readerContext) {}
 
+    /**
+     * Executed when a shard goes from idle to non-idle state
+     */
+    default void onSearchIdleReactivation() {}
+
     /**
      * A Composite listener that multiplexes calls to each of the listeners methods.
      */
@@ -310,5 +315,16 @@ public void onFreePitContext(ReaderContext readerContext) {
                 }
             }
         }
+
+        @Override
+        public void onSearchIdleReactivation() {
+            for (SearchOperationListener listener : listeners) {
+                try {
+                    listener.onSearchIdleReactivation();
+                } catch (Exception e) {
+                    logger.warn(() -> new ParameterizedMessage("onNewSearchIdleReactivation listener [{}] failed", listener), e);
+                }
+            }
+        }
     }
 }
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
index 4cd10c6874e0a..4413c8eb370be 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
@@ -253,6 +253,10 @@ protected Table getTableWithHeader(final RestRequest request) {
             "search.point_in_time_total",
             "alias:spto,searchPointInTimeTotal;default:false;text-align:right;desc:completed point in time contexts"
         );
+        table.addCell(
+            "search.search_idle_reactivate_count_total",
+            "alias:ssirct,searchSearchIdleReactivateCountTotal;default:false;text-align:right;desc:number of times a shard reactivated"
+        );
 
         table.addCell("segments.count", "alias:sc,segmentsCount;default:false;text-align:right;desc:number of segments");
         table.addCell("segments.memory", "alias:sm,segmentsMemory;default:false;text-align:right;desc:memory used by segments");
@@ -427,6 +431,7 @@ Table buildTable(RestRequest request, ClusterStateResponse state, IndicesStatsRe
             table.addCell(getOrNull(commonStats, CommonStats::getSearch, i -> i.getTotal().getPitCurrent()));
             table.addCell(getOrNull(commonStats, CommonStats::getSearch, i -> i.getTotal().getPitTime()));
             table.addCell(getOrNull(commonStats, CommonStats::getSearch, i -> i.getTotal().getPitCount()));
+            table.addCell(getOrNull(commonStats, CommonStats::getSearch, i -> i.getTotal().getSearchIdleReactivateCount()));
 
             table.addCell(getOrNull(commonStats, CommonStats::getSegments, SegmentsStats::getCount));
             table.addCell(getOrNull(commonStats, CommonStats::getSegments, SegmentsStats::getZeroMemory));
diff --git a/server/src/test/java/org/opensearch/cluster/service/TaskBatcherTests.java b/server/src/test/java/org/opensearch/cluster/service/TaskBatcherTests.java
index 070fde523fe87..b0916ce9236f7 100644
--- a/server/src/test/java/org/opensearch/cluster/service/TaskBatcherTests.java
+++ b/server/src/test/java/org/opensearch/cluster/service/TaskBatcherTests.java
@@ -218,7 +218,8 @@ public void testTasksAreExecutedInOrder() throws BrokenBarrierException, Interru
             executors[i] = new TaskExecutor();
         }
 
-        int tasksSubmittedPerThread = randomIntBetween(2, 1024);
+        // it will create at most 8192 threads, which will cause native memory oom. so we limit the number of created threads.
+        int tasksSubmittedPerThread = randomIntBetween(2, 128);
 
         CopyOnWriteArrayList<Tuple<String, Throwable>> failures = new CopyOnWriteArrayList<>();
         CountDownLatch updateLatch = new CountDownLatch(numberOfThreads * tasksSubmittedPerThread);
@@ -286,7 +287,7 @@ public void testNoTasksAreDroppedInParallelSubmission() throws BrokenBarrierExce
             executors[i] = new TaskExecutor();
         }
 
-        int tasksSubmittedPerThread = randomIntBetween(2, 1024);
+        int tasksSubmittedPerThread = randomIntBetween(2, 128);
 
         CopyOnWriteArrayList<Tuple<String, Throwable>> failures = new CopyOnWriteArrayList<>();
         CountDownLatch updateLatch = new CountDownLatch(numberOfThreads * tasksSubmittedPerThread);
diff --git a/server/src/test/java/org/opensearch/common/settings/SettingTests.java b/server/src/test/java/org/opensearch/common/settings/SettingTests.java
index c6da96b521276..7ebee680e8e52 100644
--- a/server/src/test/java/org/opensearch/common/settings/SettingTests.java
+++ b/server/src/test/java/org/opensearch/common/settings/SettingTests.java
@@ -201,7 +201,7 @@ public void testMemorySize() {
         assertEquals(new ByteSizeValue(12), value.get());
 
         assertTrue(settingUpdater.apply(Settings.builder().put("a.byte.size", "20%").build(), Settings.EMPTY));
-        assertEquals(new ByteSizeValue((int) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.2)), value.get());
+        assertEquals(new ByteSizeValue((long) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.2)), value.get());
     }
 
     public void testMemorySizeWithFallbackValue() {
@@ -219,10 +219,12 @@ public void testMemorySizeWithFallbackValue() {
         assertEquals(memorySizeValue.getBytes(), JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.2, 1.0);
 
         assertTrue(settingUpdater.apply(Settings.builder().put("a.byte.size", "30%").build(), Settings.EMPTY));
-        assertEquals(new ByteSizeValue((int) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.3)), value.get());
+        // If value=getHeapMax()*0.3 is bigger than 2gb, and is bigger than Integer.MAX_VALUE,
+        // then (long)((int) value) will lose precision.
+        assertEquals(new ByteSizeValue((long) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.3)), value.get());
 
         assertTrue(settingUpdater.apply(Settings.builder().put("b.byte.size", "40%").build(), Settings.EMPTY));
-        assertEquals(new ByteSizeValue((int) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.4)), value.get());
+        assertEquals(new ByteSizeValue((long) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.4)), value.get());
     }
 
     public void testSimpleUpdate() {
diff --git a/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java b/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
index 5656b77445772..594700ea60b3e 100644
--- a/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
+++ b/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
@@ -57,9 +57,9 @@ public void testShardLevelSearchGroupStats() throws Exception {
         // let's create two dummy search stats with groups
         Map<String, Stats> groupStats1 = new HashMap<>();
         Map<String, Stats> groupStats2 = new HashMap<>();
-        groupStats2.put("group1", new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1));
-        SearchStats searchStats1 = new SearchStats(new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), 0, groupStats1);
-        SearchStats searchStats2 = new SearchStats(new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), 0, groupStats2);
+        groupStats2.put("group1", new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1));
+        SearchStats searchStats1 = new SearchStats(new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), 0, groupStats1);
+        SearchStats searchStats2 = new SearchStats(new Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), 0, groupStats2);
 
         // adding these two search stats and checking group stats are correct
         searchStats1.add(searchStats2);
@@ -128,6 +128,7 @@ private static void assertStats(Stats stats, long equalTo) {
         assertEquals(equalTo, stats.getSuggestCount());
         assertEquals(equalTo, stats.getSuggestTimeInMillis());
         assertEquals(equalTo, stats.getSuggestCurrent());
+        assertEquals(equalTo, stats.getSearchIdleReactivateCount());
         // avg_concurrency is not summed up across stats
         assertEquals(1, stats.getConcurrentAvgSliceCount(), 0);
     }
diff --git a/server/src/test/java/org/opensearch/index/shard/SearchOperationListenerTests.java b/server/src/test/java/org/opensearch/index/shard/SearchOperationListenerTests.java
index 98f86758ea2ca..c61c13eecf2c3 100644
--- a/server/src/test/java/org/opensearch/index/shard/SearchOperationListenerTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/SearchOperationListenerTests.java
@@ -64,6 +64,7 @@ public void testListenersAreExecuted() {
         AtomicInteger newScrollContext = new AtomicInteger();
         AtomicInteger freeScrollContext = new AtomicInteger();
         AtomicInteger validateSearchContext = new AtomicInteger();
+        AtomicInteger searchIdleReactivateCount = new AtomicInteger();
         AtomicInteger timeInNanos = new AtomicInteger(randomIntBetween(0, 10));
         SearchOperationListener listener = new SearchOperationListener() {
             @Override
@@ -133,6 +134,11 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
                 assertNotNull(readerContext);
                 validateSearchContext.incrementAndGet();
             }
+
+            @Override
+            public void onSearchIdleReactivation() {
+                searchIdleReactivateCount.incrementAndGet();
+            }
         };
 
         SearchOperationListener throwingListener = (SearchOperationListener) Proxy.newProxyInstance(
@@ -169,6 +175,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(0, newScrollContext.get());
         assertEquals(0, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onFetchPhase(ctx, timeInNanos.get());
@@ -182,6 +189,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(0, newScrollContext.get());
         assertEquals(0, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onPreQueryPhase(ctx);
@@ -195,6 +203,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(0, newScrollContext.get());
         assertEquals(0, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onPreFetchPhase(ctx);
@@ -208,6 +217,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(0, newScrollContext.get());
         assertEquals(0, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onFailedFetchPhase(ctx);
@@ -221,6 +231,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(0, newScrollContext.get());
         assertEquals(0, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onFailedQueryPhase(ctx);
@@ -234,6 +245,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(0, newScrollContext.get());
         assertEquals(0, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onNewReaderContext(mock(ReaderContext.class));
@@ -247,6 +259,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(0, newScrollContext.get());
         assertEquals(0, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onNewScrollContext(mock(ReaderContext.class));
@@ -260,6 +273,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(2, newScrollContext.get());
         assertEquals(0, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onFreeReaderContext(mock(ReaderContext.class));
@@ -273,6 +287,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(2, newScrollContext.get());
         assertEquals(2, freeContext.get());
         assertEquals(0, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         compositeListener.onFreeScrollContext(mock(ReaderContext.class));
@@ -286,6 +301,21 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(2, newScrollContext.get());
         assertEquals(2, freeContext.get());
         assertEquals(2, freeScrollContext.get());
+        assertEquals(0, searchIdleReactivateCount.get());
+        assertEquals(0, validateSearchContext.get());
+
+        compositeListener.onSearchIdleReactivation();
+        assertEquals(2, preFetch.get());
+        assertEquals(2, preQuery.get());
+        assertEquals(2, failedFetch.get());
+        assertEquals(2, failedQuery.get());
+        assertEquals(2, onQuery.get());
+        assertEquals(2, onFetch.get());
+        assertEquals(2, newContext.get());
+        assertEquals(2, newScrollContext.get());
+        assertEquals(2, freeContext.get());
+        assertEquals(2, freeScrollContext.get());
+        assertEquals(2, searchIdleReactivateCount.get());
         assertEquals(0, validateSearchContext.get());
 
         if (throwingListeners == 0) {
@@ -311,6 +341,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest
         assertEquals(2, newScrollContext.get());
         assertEquals(2, freeContext.get());
         assertEquals(2, freeScrollContext.get());
+        assertEquals(2, searchIdleReactivateCount.get());
         assertEquals(2, validateSearchContext.get());
     }
 }
diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java
index fa13ec2036797..883df7da5d717 100644
--- a/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java
+++ b/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java
@@ -125,7 +125,7 @@ public void testBuildTable() {
         assertThat(headers.get(6).value, equalTo("ip"));
         assertThat(headers.get(7).value, equalTo("id"));
         assertThat(headers.get(8).value, equalTo("node"));
-        assertThat(headers.get(78).value, equalTo("docs.deleted"));
+        assertThat(headers.get(79).value, equalTo("docs.deleted"));
 
         final List<List<Table.Cell>> rows = table.getRows();
         assertThat(rows.size(), equalTo(numShards));
@@ -141,9 +141,9 @@ public void testBuildTable() {
             assertThat(row.get(4).value, equalTo(shardStats.getStats().getDocs().getCount()));
             assertThat(row.get(6).value, equalTo(localNode.getHostAddress()));
             assertThat(row.get(7).value, equalTo(localNode.getId()));
-            assertThat(row.get(76).value, equalTo(shardStats.getDataPath()));
-            assertThat(row.get(77).value, equalTo(shardStats.getStatePath()));
-            assertThat(row.get(78).value, equalTo(shardStats.getStats().getDocs().getDeleted()));
+            assertThat(row.get(77).value, equalTo(shardStats.getDataPath()));
+            assertThat(row.get(78).value, equalTo(shardStats.getStatePath()));
+            assertThat(row.get(79).value, equalTo(shardStats.getStats().getDocs().getDeleted()));
         }
     }
 }
diff --git a/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java b/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java
index c478bf9239f74..0e42787b16be8 100644
--- a/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java
+++ b/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java
@@ -71,6 +71,17 @@ public static String randomFieldName(Random random) {
         return fieldName.toString();
     }
 
+    /**
+     * Returns a random field name that doesn't exist in the document.
+     */
+    public static String randomNonExistingFieldName(Random random, IngestDocument ingestDocument) {
+        String fieldName;
+        do {
+            fieldName = randomFieldName(random);
+        } while (canAddField(fieldName, ingestDocument) == false);
+        return fieldName;
+    }
+
     /**
      * Returns a random leaf field name.
      */