Merge branch 'net-offloaded-stats'