PR proposition here: https://github.com/hibernate/hibernate-orm/pull/902