I think that we should consider the idea of upgrading to 6.1, we could have some few benefits from it, such as a Lucene update (Lucene 8.11), new terms predicate, regex predicate, id projection, missing on distance predicate, support for relative paths on query dsl, support for Java modules, conditional mass-indexing, supported access to the Lucene index reader, ...