Merge branch 'stats-genserver-fix' into 'develop'