PRs:
https://github.com/hibernate/hibernate-orm/pull/2759
https://github.com/hibernate/hibernate-orm/pull/2758