merged STREAMS-218