IT Support I have created a PR with a different solutionhttps://github.com/hibernate/hibernate-orm/pull/3358