Improved statistical data infrastructure
p4#: 20694