Try to fix avatars
Merge branch 'develop'