Resolves STREAMS-134