(cherry picked from commit eee1190f10623b6daa374ed59676f639152ceae7) # Conflicts: # frontend/src/components/Settings/ProfileImageEditor.vue
(cherry picked from commit eee1190f10623b6daa374ed59676f639152ceae7) # Conflicts: # frontend/src/components/Settings/ProfileImageEditor.vue