Avatars not being rendered
Merge remote-tracking branch 'origin/release-candidate' into release-candidate