removed all the side effects of counters
Merge remote-tracking branch 'origin/master'