diff --git a/build.gradle b/build.gradle
index b23bc5fc..22f1d5db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -293,7 +293,7 @@ dependencies {
             force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}"
             force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
             force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
-            force "org.apache.commons:commons-lang3:3.12.0"
+            force "org.apache.commons:commons-lang3:${versions.commonslang}"
             force "org.slf4j:slf4j-api:2.0.0"
             force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4
         }
diff --git a/licenses/bcprov-jdk15to18-LICENSE.txt b/licenses/bcprov-jdk15to18-LICENSE.txt
index d067d154..c46e6aa1 100644
--- a/licenses/bcprov-jdk15to18-LICENSE.txt
+++ b/licenses/bcprov-jdk15to18-LICENSE.txt
@@ -5,4 +5,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/licenses/netty-buffer-4.1.96.Final.jar.sha1 b/licenses/netty-buffer-4.1.96.Final.jar.sha1
deleted file mode 100644
index 7abdb33d..00000000
--- a/licenses/netty-buffer-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4b80fffbe77485b457bf844289bf1801f61b9e91
\ No newline at end of file
diff --git a/licenses/netty-buffer-4.1.97.Final.jar.sha1 b/licenses/netty-buffer-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..84303553
--- /dev/null
+++ b/licenses/netty-buffer-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f
\ No newline at end of file
diff --git a/licenses/netty-codec-4.1.96.Final.jar.sha1 b/licenses/netty-codec-4.1.96.Final.jar.sha1
deleted file mode 100644
index 8fdb32be..00000000
--- a/licenses/netty-codec-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9cfe430f8b14e7ba86969d8e1126aa0aae4d18f0
\ No newline at end of file
diff --git a/licenses/netty-codec-4.1.97.Final.jar.sha1 b/licenses/netty-codec-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..7a36dc1f
--- /dev/null
+++ b/licenses/netty-codec-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+384ba4d75670befbedb45c4d3b497a93639c206d
\ No newline at end of file
diff --git a/licenses/netty-codec-http-4.1.96.Final.jar.sha1 b/licenses/netty-codec-http-4.1.96.Final.jar.sha1
deleted file mode 100644
index dfb0cf39..00000000
--- a/licenses/netty-codec-http-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a4d0d95df5026965c454902ef3d6d84b81f89626
\ No newline at end of file
diff --git a/licenses/netty-codec-http-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..37b78a32
--- /dev/null
+++ b/licenses/netty-codec-http-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+af78acec783ffd77c63d8aeecc21041fd39ac54f
\ No newline at end of file
diff --git a/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
deleted file mode 100644
index 2fc787ee..00000000
--- a/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cc8baf4ff67c1bcc0cde60bc5c2bb9447d92d9e6
\ No newline at end of file
diff --git a/licenses/netty-codec-http2-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..cbf685a6
--- /dev/null
+++ b/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+893888d09a7bef0d0ba973d7471943e765d0fd08
\ No newline at end of file
diff --git a/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
deleted file mode 100644
index 8e959bda..00000000
--- a/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f53c52dbddaa4a02a51430405792d3f30a89b147
\ No newline at end of file
diff --git a/licenses/netty-codec-socks-4.1.97.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..d06147a0
--- /dev/null
+++ b/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+30e8fa29a349db5a933225d61891b8802836bb79
\ No newline at end of file
diff --git a/licenses/netty-common-4.1.96.Final.jar.sha1 b/licenses/netty-common-4.1.96.Final.jar.sha1
deleted file mode 100644
index 85b5f527..00000000
--- a/licenses/netty-common-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d10c167623cbc471753f950846df241d1021655c
\ No newline at end of file
diff --git a/licenses/netty-common-4.1.97.Final.jar.sha1 b/licenses/netty-common-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..1bdfec3a
--- /dev/null
+++ b/licenses/netty-common-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+7cceacaf11df8dc63f23d0fb58e9d4640fc88404
\ No newline at end of file
diff --git a/licenses/netty-handler-4.1.96.Final.jar.sha1 b/licenses/netty-handler-4.1.96.Final.jar.sha1
deleted file mode 100644
index fe4f48c6..00000000
--- a/licenses/netty-handler-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7840d7523d709e02961b647546f9d9dde1699306
\ No newline at end of file
diff --git a/licenses/netty-handler-4.1.97.Final.jar.sha1 b/licenses/netty-handler-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..8b7b50a6
--- /dev/null
+++ b/licenses/netty-handler-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36
\ No newline at end of file
diff --git a/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
deleted file mode 100644
index d410208d..00000000
--- a/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dcabd63f4aaec2b4cad7588bfdd4cd2c82287e38
\ No newline at end of file
diff --git a/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..67c3a763
--- /dev/null
+++ b/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+a99ecef0e1d86a92e40a7c89805c236d9cd7493e
\ No newline at end of file
diff --git a/licenses/netty-resolver-4.1.96.Final.jar.sha1 b/licenses/netty-resolver-4.1.96.Final.jar.sha1
deleted file mode 100644
index 9e93f013..00000000
--- a/licenses/netty-resolver-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e51db5568a881e0f9b013b35617c597dc32f130
\ No newline at end of file
diff --git a/licenses/netty-resolver-4.1.97.Final.jar.sha1 b/licenses/netty-resolver-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..032959e9
--- /dev/null
+++ b/licenses/netty-resolver-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+cec8348108dc76c47cf87c669d514be52c922144
\ No newline at end of file
diff --git a/licenses/netty-transport-4.1.96.Final.jar.sha1 b/licenses/netty-transport-4.1.96.Final.jar.sha1
deleted file mode 100644
index 707285d3..00000000
--- a/licenses/netty-transport-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbd15ca244be28e1a98ed29b9d755edbfa737e02
\ No newline at end of file
diff --git a/licenses/netty-transport-4.1.97.Final.jar.sha1 b/licenses/netty-transport-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..107863c1
--- /dev/null
+++ b/licenses/netty-transport-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+f37380d23c9bb079bc702910833b2fd532c9abd0
\ No newline at end of file
diff --git a/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
deleted file mode 100644
index e911c47d..00000000
--- a/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-daf8578cade63a01525ee9d70371fa78e6e91094
\ No newline at end of file
diff --git a/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
new file mode 100644
index 00000000..f736d37d
--- /dev/null
+++ b/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+d469d84265ab70095b01b40886cabdd433b6e664
\ No newline at end of file
diff --git a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1
index 3e2317ed..6b958715 100644
--- a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1
+++ b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1
@@ -1 +1 @@
-50c9a65da3acb24e94c6dbb5e2afda2d7dd536ad
\ No newline at end of file
+0f872542fa9a89746f0cd60fc465c33537d41701
\ No newline at end of file
diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
index c314b6be..c90c02ab 100644
--- a/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
+++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
@@ -188,8 +188,10 @@ void generateFinishMetrics(long startTime) {
 
     // - Separated to have a unit test; and catch any code changes around this field
     Field getClusterManagerServiceTPExecutorField() throws NoSuchFieldException {
+        // Currently ClusterManagerService extends MasterService, remove getSuperClass(),
+        // once MasterService contents are moved and class is removed.
         Field threadPoolExecutorField =
-                ClusterManagerService.class.getDeclaredField("threadPoolExecutor");
+                ClusterManagerService.class.getSuperclass().getDeclaredField("threadPoolExecutor");
         threadPoolExecutorField.setAccessible(true);
         return threadPoolExecutorField;
     }