ISPN-3572

Depends on https://github.com/infinispan/infinispan/pull/2118/