I’ve added PR https://github.com/hibernate/hibernate-orm/pull/2947 if you want to take a look Christian and let me know if that satisfies your requirements.