Merge remote-tracking branch 'origin/STREAMS-187'
Auto-merge | Integrating changes from apache/master