Merge branch 'vici-stats'