A second PR : https://github.com/hibernate/hibernate-orm/pull/1350 , after team members advices.