Sorry, my work there is not upstream yet. You’d have to try with the second branch/PR I listed, which is most likely the solution we will go with - https://github.com/hibernate/hibernate-orm/pull/5994