[OGM-1558] - Hibernate JIRA