[HV-308] - Hibernate JIRA