Felix Feisst, we intend to deprecate and in some cases remove a few things in ORM6 so in order to prepare Envers for this, I am adding our own MatchMode implementation to replace the one used from org.hibernate.criterion. Once I push that to master, I'll update your PR to use that implementation instead. Just thought I'd let you know.