To be done in 5.8.0.Beta4/5.8.0.CR1 if Infinispan has been able to keep up with changes in HSEARCH-1404 Pull Request Sent . It all depends on whether Infinispan will be able to cope with these changes or not. If they don't, we'll just postpone this ticket to 6.