STREAMS-162
Auto-merge | Integrating changes from apache/master