Hibernate
Merge origin/master