Accidentally pushed changes related to new infinispan changes in this group