[OGM-1571] - Hibernate JIRA