diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 6009021da14..7aedd395b93 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 7.0.0-alpha1
-lucene            = 7.4.0-snapshot-1cbadda4d3
+lucene            = 7.4.0-snapshot-0a7c3f462f
 
 # optional dependencies
 spatial4j         = 0.7
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..25e2291d36e
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+bf2cfa0551ebdf08a2cf3079f3c74643bd9dbb76
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 3bbaa2ba0a7..00000000000
--- a/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-98c920972b2f5e8563540e805d87e6a3bc888972
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..3fdd3366122
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+82d83fcac1d9c8948aa0247fc9c87f177ddbd59b
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 7f3d3b5ccf6..00000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-844e2b76f4bc6e646e1c3257d668ac598e03f36a
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..855d6ebe4ae
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+73fd4364f2931e7c8303b5927e140a7d21116c36
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 65423fff2a4..00000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2f2bd2d67c7952e4ae14ab3f742824a45d0d1719
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..091097f1a84
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+0a2c4417fa9a8be078864f590a5a66b98d551cf5
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 04fa62ce64a..00000000000
--- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-46ad7ebcfcdbdb60dd54aae4d720356a7a51c7c0
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..b18addf0b58
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+6fa179924f139a30fc0e5399256e1a44562ed32b
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 55bc8869196..00000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-548e9f2b4d4a985dc174b2eee4007c0bd5642e68
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..7b7141b6f40
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+5ed135d34d7868b71a725257a46dc8d8735a15d4
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index be668543216..00000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b90e66f4104f0234cfef335762f65a6fed695231
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..73be96c477e
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+875911b36b99c2103719f94559878a0ecb862fb6
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index b77acdc34f3..00000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-929a4eb52b11f6d3f0df9c8eba014f5ee2464c67
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..0c85d3f6c85
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+e7191628df8cb72382a20da79224aef677117849
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index cce4b6ff18d..00000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e6575a411b65cd95e0e54f04d3da278b68be521
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..db3885eb62f
--- /dev/null
+++ b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+8cd761f40c4a89ed977167f0518d12e409eaf3d8
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 82585bb7ff3..00000000000
--- a/server/licenses/lucene-analyzers-common-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0f75703c30756c31f7d09ec79191dab6fb35c958
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..bd8711a4d53
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+8c93ed67599d345b9359586248ab92342d7d3033
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 981e6d1a173..00000000000
--- a/server/licenses/lucene-backward-codecs-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5c519fdea65726612f79e3dd942b7316966646e
\ No newline at end of file
diff --git a/server/licenses/lucene-core-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-core-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..36bf03bbbdb
--- /dev/null
+++ b/server/licenses/lucene-core-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+003ed080e5184661e606091cd321c229798b22f8
\ No newline at end of file
diff --git a/server/licenses/lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index cea13d14fe1..00000000000
--- a/server/licenses/lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f345b6aa3c550dafc63de3e5a5c404691e782336
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-grouping-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..0f940ee9c7a
--- /dev/null
+++ b/server/licenses/lucene-grouping-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+0b4be9f96edfd3dbcff5aa9b3f0914e86eb9cc51
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-grouping-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index fcb173608ef..00000000000
--- a/server/licenses/lucene-grouping-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7a74855e37124a27af36390c9d15abe33614129e
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-highlighter-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..fdc9336fb2c
--- /dev/null
+++ b/server/licenses/lucene-highlighter-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+a5dcceb5bc017cee6ab5d3ee1943aca1ac6fe074
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-highlighter-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 79addefbfc6..00000000000
--- a/server/licenses/lucene-highlighter-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e3df4b469465ef101254fdcbb08ebd8a19f1f9d
\ No newline at end of file
diff --git a/server/licenses/lucene-join-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-join-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..62726ca415a
--- /dev/null
+++ b/server/licenses/lucene-join-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+b59e7441f121da969bef8eef2c0c61743b4230a8
\ No newline at end of file
diff --git a/server/licenses/lucene-join-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-join-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index a9838db7caa..00000000000
--- a/server/licenses/lucene-join-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-05d236149c99c860e6b627a8f78ea32918c108c3
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-memory-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..a68093d2fc4
--- /dev/null
+++ b/server/licenses/lucene-memory-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+46736dbb07b432f0a7c1b3080f62932c483e5cb9
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-memory-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 679c79788f5..00000000000
--- a/server/licenses/lucene-memory-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d83e7e65eb268425f7bd5be2425d4a00b556bc47
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-misc-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..23e2b68f3df
--- /dev/null
+++ b/server/licenses/lucene-misc-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+ee203718d525da0c6258a51a5a32d877089fe5af
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-misc-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index c403d4c4f86..00000000000
--- a/server/licenses/lucene-misc-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-440a998b5bf99871bec4272a219de01b25751d5c
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-queries-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..5bac053813e
--- /dev/null
+++ b/server/licenses/lucene-queries-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+cf17a332d8e42a45e8f013d5df408f4391d2620a
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-queries-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 6b8897d1ae7..00000000000
--- a/server/licenses/lucene-queries-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a5c031155fdfa743af321150c0dd654a6ea3c71
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-queryparser-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..471aa797028
--- /dev/null
+++ b/server/licenses/lucene-queryparser-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+04832303d70502d2ece44501cb1716f42e24fe35
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-queryparser-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index b6c6bf76610..00000000000
--- a/server/licenses/lucene-queryparser-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d021c9a461ff0f020d038ad5ecc5127973d4674a
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-sandbox-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..486dafc10c7
--- /dev/null
+++ b/server/licenses/lucene-sandbox-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+639313e3a9573779b6a28b45a7f57fc1f73ffa46
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-sandbox-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 92f64fca2c7..00000000000
--- a/server/licenses/lucene-sandbox-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9877a14c53e69b39fff2bf10d49a61171746d940
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-spatial-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..0a083b5a078
--- /dev/null
+++ b/server/licenses/lucene-spatial-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+6144b493ba3588a638858d0058054758acc619b9
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-spatial-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 2f691988c44..00000000000
--- a/server/licenses/lucene-spatial-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7d7e5101b46a120efa311509948c0d1f9bf30155
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..851b0d76d3e
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+9d00c6b8bbbbb496aecd555406267fee9e0af914
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 86c147f9610..00000000000
--- a/server/licenses/lucene-spatial-extras-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5a4c11db96ae70b9048243cc530fcbc76faa0978
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-spatial3d-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..22ce3c72443
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+159cdb6d36845690cb1972d02cc0b472bb14b7f3
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-spatial3d-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 2fbdcdecf1a..00000000000
--- a/server/licenses/lucene-spatial3d-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-afb01af1450067b145ca2c1d737b5907288af560
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/server/licenses/lucene-suggest-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..0724381bcc6
--- /dev/null
+++ b/server/licenses/lucene-suggest-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+af1dd0218d58990cca5c1592d9722e67d233c996
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/server/licenses/lucene-suggest-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index 1a86525735c..00000000000
--- a/server/licenses/lucene-suggest-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-473f0221e0b2ea45940d8ae6dcf16e39c81b18c2
\ No newline at end of file
diff --git a/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java b/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java
index cbe1721f07f..40c8277d399 100644
--- a/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java
+++ b/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java
@@ -56,13 +56,13 @@ final class TranslogLeafReader extends LeafReader {
     private final Translog.Index operation;
     private static final FieldInfo FAKE_SOURCE_FIELD
         = new FieldInfo(SourceFieldMapper.NAME, 1, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(),
-        0,0);
+        0, 0, false);
     private static final FieldInfo FAKE_ROUTING_FIELD
         = new FieldInfo(RoutingFieldMapper.NAME, 2, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(),
-        0,0);
+        0, 0, false);
     private static final FieldInfo FAKE_ID_FIELD
         = new FieldInfo(IdFieldMapper.NAME, 3, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(),
-        0,0);
+        0, 0, false);
     private final Version indexVersionCreated;
 
     TranslogLeafReader(Translog.Index operation, Version indexVersionCreated) {
diff --git a/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-0a7c3f462f.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-0a7c3f462f.jar.sha1
new file mode 100644
index 00000000000..36bf03bbbdb
--- /dev/null
+++ b/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-0a7c3f462f.jar.sha1
@@ -0,0 +1 @@
+003ed080e5184661e606091cd321c229798b22f8
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1
deleted file mode 100644
index cea13d14fe1..00000000000
--- a/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-1cbadda4d3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f345b6aa3c550dafc63de3e5a5c404691e782336
\ No newline at end of file