Merge branch 'hotfix/badges'
Merge branch 'hotfix/badges'
Merge branch 'hotfix/badges2' into develop