My branch is now complete, looking forward for some feedback:

• https://github.com/hibernate/hibernate-search/pull/1160

I have deployed a 5.7.0-SNAPSHOT on the JBoss Nexus repository, in case you want to try it out.