STREAMS-98 | Fixed bug where count does not get reset on match
Merge remote-tracking branch 'apache/master'