Fixed hibernate issue
Merge remote-tracking branch 'origin/serf-dev' into serf-dev