Merge branch 'hotfix/avatar' into develop
Merge branch 'develop'