We need to wait for the Hibernate ORM release. We need the following changes: https://hibernate.atlassian.net/browse/HHH-18431