Merge branch 'fix-avatar-selection-309' into next