Server-side: bugfix.
 >list for main branch.
 >hibernate update after selecting
Merge branch 'dev' into dev-test