Could someone have a look at this issue or the attached PR?
https://github.com/hibernate/hibernate-orm/pull/2175