Merge "Hibernate db fix"