rebase with master

3 jobs for !194 with vuln-fix-lucene in 25 minutes and 6 seconds (queued for 2 seconds)
latest merge request