Merge pull request #1020 from ludovic-henry/pr7-system-counters