Merge branch 'hotfix/badges'
up
Merge branch 'hotfix/badge' into develop