Gunnar Morling I've merged your PR https://github.com/hibernate/hibernate-search/pull/793 , that's not enough to resolve the issue right? Maybe we should split the issue, to track what was done already vs. what's missing.