Well, I have another big raft of changes coming in https://github.com/hibernate/hibernate-orm/pull/6913 , but if it isn’t fixed as a side-effect of those changes, you might be out of luck.