Remove passing of losing userId from client (WIP)
Add onMerge hook
Merge branch 'Server-side-hooks' into testmaster