[OGM-1556] - Hibernate JIRA