PR reported for master to avoid conflicts: https://github.com/hibernate/hibernate-orm/pull/861