Merge branch 'master' into develop
fix
Merge branch 'hotfix-stat' into develop
Merge branch 'develop'