- fixed failing client tests after websockets callback signature changes
Merge branch 'master' into refactor-model-junction