Merge branch 'fix/stats-on-startup' into 'develop'