Merge pull request #229 from mattkovacs/master

renaming counter from events to entries
Fixing D-10927
Merge remote-tracking branch 'upstream/master'