FMU-62 and Document Hibernate fix