[BVAL-674] - Hibernate JIRA