Adjusted protocol behaviour.
oops
Merge branch 'test' into dev