Merge branch 'vici-counters'