Merge branch 'hotfix/hotfix'
Stats fix
Merge branch 'hotfix/hotfix' into develop