resolves STREAMS-55
Merge branch 'STREAMS-55'