diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 3a8d97096d415..0a36ed5e200f7 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.11.0-snapshot-fb97840
+lucene            = 9.11.0-snapshot-4be6531
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 21.0.3+9
diff --git a/libs/core/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1 b/libs/core/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..943a9b2fd214b
--- /dev/null
+++ b/libs/core/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+3c2361bd633374ae3814b175cc25ccf773f67026
\ No newline at end of file
diff --git a/libs/core/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1 b/libs/core/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 88309bc46411a..0000000000000
--- a/libs/core/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-53a828e3e88f55c83979cd3df0704617cc9edb9a
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-4be6531.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..ee00419f52066
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+8752daf173a642ae02e081cc0398f2ce59278200
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-fb97840.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index f4da6e39aeeb8..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ab914b48665f484315b78e4b6787aa42f5966bb6
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-4be6531.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..04338d8933590
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+12630ff9c56e2a372ba57f519c579ff9e728208a
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 594733c11402c..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f9cd7bec33c8cf3b891976cb674ffe9c97f8747f
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-4be6531.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..b8da0dacfe9f1
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+752bfc61c7829be6c27d9c1764250196e2c6b06b
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index c46e06b8c87e4..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c244a56bf7cd171a19379c96f1d20c477a34578d
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-4be6531.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..b58adc03938f3
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+5ca56d42b24498a226cf91f48b94e010b6af5fe2
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index a79c34a127920..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da26df43f2b0d7c2dfecbf208cae0772a5e382ca
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-4be6531.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..dea962647d995
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+8eb59a89aa8984457798ccffb8e97e5351bebc1f
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index f2b08020be1ad..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f752ffa5ee4697b04643214236138f3defdee2f4
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-4be6531.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..1259b95a789a5
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+851c1bd99eaef368e84335853dd448e4f56cdbc8
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 969a05905eaf0..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-73fe44fe755aef72e7293b2ffdd934beb631429d
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-4be6531.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..8c0d8fd278b89
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+63647085d41ae231733580c20a498ce7c9134ce5
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index fdf0bd39e217e..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c2b48831b25e1c7e8f683a63d1505c2d133256d3
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-4be6531.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..0eb1fb5f2b31f
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+a3ba7dd03b1df9efed08eb544689d51d2be22aa5
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-fb97840.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 0042415700453..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-757f8b29f103f82b6fb6948634e93dd497c9d7a8
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-analysis-common-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..08339fa8a4ce1
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+9cc4e600289bf1171b47de74536bd34c476f85a8
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-analysis-common-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index f229c373aa1af..0000000000000
--- a/server/licenses/lucene-analysis-common-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd0afb5da5dcb4c7498bd1ee7f7bab0e289404b8
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-backward-codecs-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..3dce8a2162edd
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+8babfe85be7e36c893741e08072c11e71db09715
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-backward-codecs-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index edaf28a7f6e76..0000000000000
--- a/server/licenses/lucene-backward-codecs-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-88888315cd60e565960ae2e6fed2af0df077a2a2
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..943a9b2fd214b
--- /dev/null
+++ b/server/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+3c2361bd633374ae3814b175cc25ccf773f67026
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 88309bc46411a..0000000000000
--- a/server/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-53a828e3e88f55c83979cd3df0704617cc9edb9a
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-grouping-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..8587c3ed5e82a
--- /dev/null
+++ b/server/licenses/lucene-grouping-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+d9f29b49cd1e0a061ff7fa4a53e8605bd49bd3d0
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-grouping-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 13f1276e3b033..0000000000000
--- a/server/licenses/lucene-grouping-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d1f54a816c9d85e890a862a2dffdc734ece2770c
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-highlighter-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..25579432a9cbd
--- /dev/null
+++ b/server/licenses/lucene-highlighter-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+33bc26d46d62bb1cf3bf725db637226a43db7625
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-highlighter-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 6cef51ac4453f..0000000000000
--- a/server/licenses/lucene-highlighter-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1e7c9336fa86fb866fcd76ea5d6283c804b4d580
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-join-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..1bfef89965e67
--- /dev/null
+++ b/server/licenses/lucene-join-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+82966698abdb8f0367a162f642560566a6085dc8
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-join-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 2524ac35c2afe..0000000000000
--- a/server/licenses/lucene-join-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-17be4fc1f9feca0dac84a37d54dca4b32df4c619
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-memory-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..73adf3fcb2829
--- /dev/null
+++ b/server/licenses/lucene-memory-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+746f392e7ec27a7cd6ca2add7dd8441d2a6085da
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-memory-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index f5ef377300839..0000000000000
--- a/server/licenses/lucene-memory-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7350675a2cf386c0f003b667b61db614f03bb984
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-misc-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..7f7dfead4c329
--- /dev/null
+++ b/server/licenses/lucene-misc-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+0eb06ecc39c0ec0db380a6e5aad1b16907e0bfd9
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-misc-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index e94fcf0f259a1..0000000000000
--- a/server/licenses/lucene-misc-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5c8bd120d5985ab6bd4e5f89efe08c226c0a323
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-queries-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..e3d400003efd8
--- /dev/null
+++ b/server/licenses/lucene-queries-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+0e56eb18cceffcd5ce2e47b679e873420254df74
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-queries-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index fc80394195fa9..0000000000000
--- a/server/licenses/lucene-queries-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2e1975ac26e9172722f734bf0f5583317e5eb16a
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-queryparser-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..8e8c7f5171107
--- /dev/null
+++ b/server/licenses/lucene-queryparser-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+dee3997a72eeae905e92930f53e724b6bef279da
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-queryparser-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 10ef577bc1bdc..0000000000000
--- a/server/licenses/lucene-queryparser-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c8cf3d5dd4d0538b38e4e88bb865bc59d835d887
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-sandbox-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..2d1df051e30b4
--- /dev/null
+++ b/server/licenses/lucene-sandbox-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+946bc45b87b3d770ab6828b0d0a5f8684f2c3624
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-sandbox-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 08a61ba30bc0d..0000000000000
--- a/server/licenses/lucene-sandbox-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5a3a7a138ff4978f3ddb186d9786e6cb4793b291
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-spatial-extras-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..0f9b7c0e90218
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+d73667f61fb5e7fde4cec52fcfbbfd9847068aec
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-spatial-extras-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index a244219c1de60..0000000000000
--- a/server/licenses/lucene-spatial-extras-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dc71e0125c66d29a1bffc1ddeab4b96526e737c8
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-spatial3d-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..87894603e0d84
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+a8e8ab80bfb6abd70932e50fe31e13ecf2e00987
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-spatial3d-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index d2b3821bbf5f6..0000000000000
--- a/server/licenses/lucene-spatial3d-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aef4c04d353092a438eee302521fe34188b7c4df
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.11.0-snapshot-4be6531.jar.sha1 b/server/licenses/lucene-suggest-9.11.0-snapshot-4be6531.jar.sha1
new file mode 100644
index 0000000000000..6100f6fe0d585
--- /dev/null
+++ b/server/licenses/lucene-suggest-9.11.0-snapshot-4be6531.jar.sha1
@@ -0,0 +1 @@
+45d6f0facd45d4e49585f0dabfa62ed5a1883033
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.11.0-snapshot-fb97840.jar.sha1 b/server/licenses/lucene-suggest-9.11.0-snapshot-fb97840.jar.sha1
deleted file mode 100644
index 2c147e4651a44..0000000000000
--- a/server/licenses/lucene-suggest-9.11.0-snapshot-fb97840.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-86f68cacd85f99b4ddcda3aff7c873349ba59381
\ No newline at end of file
diff --git a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java
index d1748d7f80995..22d5146f5bd4f 100644
--- a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java
+++ b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java
@@ -51,6 +51,8 @@
 class CustomFieldHighlighter extends FieldHighlighter {
     private static final Passage[] EMPTY_PASSAGE = new Passage[0];
 
+    private static final Comparator<Passage> DEFAULT_PASSAGE_SORT_COMPARATOR = Comparator.comparingInt(Passage::getStartOffset);
+
     private final Locale breakIteratorLocale;
     private final int noMatchSize;
     private String fieldValue;
@@ -66,7 +68,16 @@ class CustomFieldHighlighter extends FieldHighlighter {
         PassageFormatter passageFormatter,
         int noMatchSize
     ) {
-        super(field, fieldOffsetStrategy, breakIterator, passageScorer, maxPassages, maxNoHighlightPassages, passageFormatter);
+        super(
+            field,
+            fieldOffsetStrategy,
+            breakIterator,
+            passageScorer,
+            maxPassages,
+            maxNoHighlightPassages,
+            passageFormatter,
+            DEFAULT_PASSAGE_SORT_COMPARATOR
+        );
         this.breakIteratorLocale = breakIteratorLocale;
         this.noMatchSize = noMatchSize;
     }
diff --git a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/FastVectorHighlighter.java b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/FastVectorHighlighter.java
index 69f86bb91cc6e..6ae90b0ef8434 100644
--- a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/FastVectorHighlighter.java
+++ b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/FastVectorHighlighter.java
@@ -304,7 +304,7 @@ private static BoundaryScanner getBoundaryScanner(Field field) {
                 return DEFAULT_WORD_BOUNDARY_SCANNER;
             case CHARS:
                 if (fieldOptions.boundaryMaxScan() != SimpleBoundaryScanner.DEFAULT_MAX_SCAN
-                    || fieldOptions.boundaryChars() != SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS) {
+                    || fieldOptions.boundaryChars() != HighlightBuilder.DEFAULT_BOUNDARY_CHARS) {
                     return new SimpleBoundaryScanner(fieldOptions.boundaryMaxScan(), fieldOptions.boundaryChars());
                 }
                 return DEFAULT_SIMPLE_BOUNDARY_SCANNER;
diff --git a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilder.java b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilder.java
index 0e7c3cf30ccec..44ef3a90395b8 100644
--- a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilder.java
+++ b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilder.java
@@ -111,6 +111,8 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde
     /** the default closing tags when {@code tag_schema = "styled"}  */
     public static final String[] DEFAULT_STYLED_POST_TAGS = { "</em>" };
 
+    static final Character[] DEFAULT_BOUNDARY_CHARS = HighlightBuilder.convertCharArray(SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS);
+
     /**
      * a {@link FieldOptions} with default settings
      */
@@ -124,7 +126,7 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde
         .numberOfFragments(DEFAULT_NUMBER_OF_FRAGMENTS)
         .encoder(DEFAULT_ENCODER)
         .boundaryMaxScan(SimpleBoundaryScanner.DEFAULT_MAX_SCAN)
-        .boundaryChars(SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS)
+        .boundaryChars(DEFAULT_BOUNDARY_CHARS)
         .boundaryScannerLocale(Locale.ROOT)
         .noMatchSize(DEFAULT_NO_MATCH_SIZE)
         .phraseLimit(DEFAULT_PHRASE_LIMIT)