STREAMS-106

https://issues.apache.org/jira/browse/STREAMS-106