Merge "Refactor internal stats code" into nextgenv2