(cherry picked from commit 68d1172b8fee86603586b21271ff5dc3f627734b)
(cherry picked from commit 4c7a40d8bc882110784dff7a8db63a44fbd9d243) # Conflicts: # frontend/src/components/Settings/General/CurrencySettings.vue # frontend/src/components/Settings/General/GeneralSettings.vue