STREAMS-99 | updated method to be protected rather than private for easier extension
Merge remote-tracking branch 'apache/master'