Oliver Libutzki any chance you could provide a test case based on https://github.com/hibernate/hibernate-test-case-templates/tree/master/orm/hibernate-orm-5 so that we can improve this?

Hard to improve things without seeing the exact issue.

Thanks!