Merge remote-tracking branch 'main/counters'