Merge branch 'ocelot-stats'