This needs to be done quickly to verify the impact of changes in Hibernate ORM but I'm not sure about which branch should receive this updated.
Needs to be discussed.