resolves STREAMS-167
resolves STREAMS-167
naming consistency
Auto-merge | Integrating changes from apache/master