Merge "Pivot network statistics to use DataInput/Output." into sc-dev