Merge "BUG-5839: Removing groups and meters on being stale-marked"