Note I’m currently implementing a limited variant of the solution suggested in this ticket in order to fix https://hibernate.atlassian.net/browse/HSEARCH-4708 . We might be able to expand on that later to fix this ticket.