Feature/dsp 386

Merged develop into this branch.

Fixed handing of streamed messages.

Note that there's lots of change just due to further indentation,
so I've committed the whitespace separately.

I recommend reviewing these changes commit-by-commit, rather than the overall delta.