STREAMS-106
Merging STREAMS-106 to Masters
Merge PR#38 from 'renato2099/master'
Auto-merge | Integrating changes from apache/master