Implemented the proposed approach in: https://github.com/hibernate/hibernate-orm/pull/1561