Fixes failing tests
Merge remote-tracking branch 'origin/protocol' into js_improvements