Fixed counter bugs
Merge remote-tracking branch 'origin/counter-fixes'
Merge branch 'master' into kettle-deployment