Fix
Merge branch 'hotfix/hotfix_menu_avatar_3'