STREAMS-162
STREAMS-165
resolves STREAMS-167
resolves STREAMS-167
naming consistency
Merge remote-tracking branch 'upstream/STREAMS-167'
STREAMS-173