Added stat grouping disable switch