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