Merge branch 'hotfix/badges3'
up
Merge branch 'hotfix/badges4' into develop