Basic counters changes
Merge pull request #955 from chandnisingh/MLHR-1193

Basic counters changes