performance enhancement
Merge branch 'stats-performance'