hibernate merge

/Tag: hibernate merge