Waiting for the next release of ORM because of https://hibernate.atlassian.net/browse/HHH-12332, https://hibernate.atlassian.net/browse/HHH-12333