add counters
Merge branch 'feature/counters-75' into staging