Merge remote-tracking branch 'quintela/stats.next' into staging