Streams 70

Reopening STREAMS-70 PR.  All comments have been addressed.