(cherry picked from commit 5eb46f6b6cd528c22a0d01cd564c7209d4ee78b4) # Conflicts: # frontend/src/components/Settings/emailConfig.ts
(cherry picked from commit 87174f207dc4fe60706b9c1d9b6be7b5a19628f9)