resolves STREAMS-206, pending feedback
Merge branch 'STREAMS-206'