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