Merge branch 'custom-avatars' into next