diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 3f1bdd48701..c9f8f4c7b21 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 7.9.0
-lucene            = 8.6.0-snapshot-6c9024f7735
+lucene            = 8.6.0-snapshot-9d6c738ffce
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 14+36
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.6.0-snapshot-6c9024f7735.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index f416f7b3044..00000000000
--- a/modules/lang-expression/licenses/lucene-expressions-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f7e94697a2f2e65aa19056118ddaa1a00df7ebbc
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..3780a62fa20
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+b151419d588744101ab6aa1a7e202a07a17e9746
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.6.0-snapshot-6c9024f7735.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 59ad9f9ad1c..00000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-891b25ddde3edffe59f9f25345762078203ddb29
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..de02679949e
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+4b7164b5b1117507c0ef3c8eef998ad737ff1fd2
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.6.0-snapshot-6c9024f7735.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 6428cb0f971..00000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-56f0262ae595875e6e163b8e31d8fcc464c208fe
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..66afc7e13c1
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+d7c96a9ae727b6c5e18bb1ed63faf5c3bf875203
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.6.0-snapshot-6c9024f7735.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index ff35f9bbf8a..00000000000
--- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b97440d8349b6e19059ef1f8566ea8753166e81
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..cbd5266cdf4
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+6445c4715b36be6c0d7e843c5b1ec6e303ab6e6c
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.6.0-snapshot-6c9024f7735.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 234e48aa71d..00000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2b65d6825a96eb2bea79d76606fdd76a789a3cd4
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..5e83b280db8
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+93aee27fc71737bd366b25c3a2957fe0429aef29
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.6.0-snapshot-6c9024f7735.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 920d9ac330b..00000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f88549ade9a0f77856d3b7808920e105e9d61bc4
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..a24d22314b6
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+525d83fae93270b77dee719c64dd4e81d001c15e
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.6.0-snapshot-6c9024f7735.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 06f4d5e186d..00000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea5671e66acb6f70a6c7cd16276b24ed0751dbf5
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..27d7e732d73
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+4fc5fc61c7c978f0eb6ea5695a70d6c4de747f35
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.6.0-snapshot-6c9024f7735.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 2e416e5f9ad..00000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bac12d02041e93e9c73c99ac0e7798a0382453c7
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..92838913205
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+c2c64f756ee96f761f00f9a38defd43d507eea0b
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-analyzers-common-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 59d399d9c8a..00000000000
--- a/server/licenses/lucene-analyzers-common-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e7fb1f82ecc255e015ae6fe8bb77c8ec8b8748ce
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-analyzers-common-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..136c162e86f
--- /dev/null
+++ b/server/licenses/lucene-analyzers-common-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+9d204ea34ae88a4470f1e9011efac42e3ff8b58c
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-backward-codecs-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index abb39d71c93..00000000000
--- a/server/licenses/lucene-backward-codecs-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-637bd4a785df39cf7720160e3d7ef40eabad13fc
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-backward-codecs-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..c040d280f7a
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+b597d27ddaaa890a09b4f61a571f712864f2ced6
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-core-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 03c775d57d6..00000000000
--- a/server/licenses/lucene-core-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec8401dfd1b41113eba06f3d626a1f2fdf589335
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-core-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..f2fe1ffad15
--- /dev/null
+++ b/server/licenses/lucene-core-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+69838ed06991014d1f2530208bef66c59a554fe2
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-grouping-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index fd77900f9d4..00000000000
--- a/server/licenses/lucene-grouping-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-138abf463c27088a50a2b7c4a267694386c3a0cb
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-grouping-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..cbcea3a62b6
--- /dev/null
+++ b/server/licenses/lucene-grouping-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+34a73729a8be3fde91f9920b5b79615b04e3ea03
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-highlighter-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index d36e1a5e876..00000000000
--- a/server/licenses/lucene-highlighter-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d8d618145b7eff4ea1a4081ef1918e8967b5ec8e
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-highlighter-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..82b6fb95f9b
--- /dev/null
+++ b/server/licenses/lucene-highlighter-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+20332b08670bf874c0db27113dd9c1507e2ce464
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-join-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 5c245a2b119..00000000000
--- a/server/licenses/lucene-join-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4b09c5c1a69ce6fe22328006d9129585009eb41a
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-join-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..6afc9c6be89
--- /dev/null
+++ b/server/licenses/lucene-join-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+42d0da090a8ae1fc411bbba62083621a9e880c06
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-memory-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 86e617e6c1c..00000000000
--- a/server/licenses/lucene-memory-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1491780984dc014d34d3d1d0c6656630ba67ca98
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-memory-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..1c8225508b8
--- /dev/null
+++ b/server/licenses/lucene-memory-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+001bf352ba947be5392d45586b8e53b04fabd58c
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-misc-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 5dc84b65df5..00000000000
--- a/server/licenses/lucene-misc-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-08a78a91082bd6ae7e4e5535060a1e59a51d8983
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-misc-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..7629c552b8f
--- /dev/null
+++ b/server/licenses/lucene-misc-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+f730849f6a1c894ede85721423e421974eaa11a8
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-queries-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 086eca77a0d..00000000000
--- a/server/licenses/lucene-queries-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a58e4fa4d7390d0c2dfaa7697702e0c4ab5add48
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-queries-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..9dfe9f89351
--- /dev/null
+++ b/server/licenses/lucene-queries-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+92e10bd79a1e330e5257fa204bce0ed0b3611f6d
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-queryparser-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index dab32b9945d..00000000000
--- a/server/licenses/lucene-queryparser-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-745ed85193fa82ef75ac92be524e90d89ead7345
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-queryparser-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..699bd59aac5
--- /dev/null
+++ b/server/licenses/lucene-queryparser-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+83cf037431b46ca97303f9c8e6b61658835d5ee2
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-sandbox-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 768370105bc..00000000000
--- a/server/licenses/lucene-sandbox-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e46dc362bfbac1609f4ecbd7838acd5dae1aa960
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-sandbox-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..4acbbe427be
--- /dev/null
+++ b/server/licenses/lucene-sandbox-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+3a1add29c46420b2ad406ff4855591bd5a9cb3ab
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-spatial-extras-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 1709692ecef..00000000000
--- a/server/licenses/lucene-spatial-extras-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-167ea704134a3e5bd6dd93283c030c21d3360c63
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-spatial-extras-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..864737fb732
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+a6c7cc66b953e4f5957f96b80b0c8f43ed6d3dfa
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-spatial3d-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index dd3497375bf..00000000000
--- a/server/licenses/lucene-spatial3d-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f20507834f2b8c6103ffdc08ac687bdf73d45a09
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-spatial3d-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..716eb7592dc
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+4edcd6c035201be43fde76a85982fc2b9a9cbdbf
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.6.0-snapshot-6c9024f7735.jar.sha1 b/server/licenses/lucene-suggest-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index c5b1c750781..00000000000
--- a/server/licenses/lucene-suggest-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ac6c604ce977f2e44a13159021ba4133594ccc40
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/server/licenses/lucene-suggest-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..574e71f9038
--- /dev/null
+++ b/server/licenses/lucene-suggest-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+a1dca9d9c650b843ca3ae812d54d8b2219b38f3a
\ No newline at end of file
diff --git a/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java
index 2164f9f2333..a9da3b342fb 100644
--- a/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java
+++ b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java
@@ -27,6 +27,7 @@ import org.apache.lucene.index.NumericDocValues;
 import org.apache.lucene.index.SortedDocValues;
 import org.apache.lucene.index.SortedNumericDocValues;
 import org.apache.lucene.index.SortedSetDocValues;
+import org.apache.lucene.search.Scorable;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.index.fielddata.AbstractNumericDocValues;
 import org.elasticsearch.index.fielddata.AbstractSortedDocValues;
@@ -139,6 +140,10 @@ abstract class CollapsingDocValuesSource<T> extends GroupSelector<T> {
                         type + "` for field `" + field + "`");
             }
         }
+
+        @Override
+        public void setScorer(Scorable scorer) throws IOException {
+        }
     }
 
     /**
@@ -251,6 +256,10 @@ abstract class CollapsingDocValuesSource<T> extends GroupSelector<T> {
                         + type + "` for field `" + field + "`");
             }
         }
+
+        @Override
+        public void setScorer(Scorable scorer) throws IOException {
+        }
     }
 
     private static DocValuesType getDocValuesType(LeafReader in, String field) {
diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java
index 13c60c0a49f..1210c62319f 100644
--- a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java
+++ b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java
@@ -27,7 +27,6 @@ import org.apache.lucene.queries.intervals.Intervals;
 import org.apache.lucene.queries.intervals.IntervalsSource;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.automaton.CompiledAutomaton;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParsingException;
@@ -795,8 +794,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont
             BytesRef normalizedTerm = analyzer.normalize(fieldType.name(), term);
             FuzzyQuery fq = new FuzzyQuery(new Term(fieldType.name(), normalizedTerm),
                 fuzziness.asDistance(term), prefixLength, 128, transpositions);
-            CompiledAutomaton[] automata = fq.getAutomata();
-            source = Intervals.multiterm(automata[automata.length - 1], term);
+            source = Intervals.multiterm(fq.getAutomata(), term);
             if (useField != null) {
                 source = Intervals.fixField(useField, source);
             }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
index e7236143634..1ca53144d81 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
@@ -339,7 +339,7 @@ public abstract class ValuesSource {
 
             @Override
             public SortedNumericDocValues longValues(LeafReaderContext context) {
-                return DocValues.emptySortedNumeric(context.reader().maxDoc());
+                return DocValues.emptySortedNumeric();
             }
 
             @Override
diff --git a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java
index 63bd21ad8df..d155b193f91 100644
--- a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java
@@ -28,7 +28,6 @@ import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.automaton.CompiledAutomaton;
 import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.compress.CompressedXContent;
@@ -549,8 +548,7 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase<IntervalQue
 
     private static IntervalsSource buildFuzzySource(String term, String label, int prefixLength, boolean transpositions, int editDistance) {
         FuzzyQuery fq = new FuzzyQuery(new Term("field", term), editDistance, prefixLength, 128, transpositions);
-        CompiledAutomaton[] automata = fq.getAutomata();
-        return Intervals.multiterm(automata[automata.length - 1], label);
+        return Intervals.multiterm(fq.getAutomata(), label);
     }
 
     public void testFuzzy() throws IOException {
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.6.0-snapshot-6c9024f7735.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.6.0-snapshot-6c9024f7735.jar.sha1
deleted file mode 100644
index 03c775d57d6..00000000000
--- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.6.0-snapshot-6c9024f7735.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec8401dfd1b41113eba06f3d626a1f2fdf589335
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.6.0-snapshot-9d6c738ffce.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.6.0-snapshot-9d6c738ffce.jar.sha1
new file mode 100644
index 00000000000..f2fe1ffad15
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.6.0-snapshot-9d6c738ffce.jar.sha1
@@ -0,0 +1 @@
+69838ed06991014d1f2530208bef66c59a554fe2
\ No newline at end of file