Merge main into dev/reminder-emails - resolved conflicts by keeping both...

Merge main into dev/reminder-emails - resolved conflicts by keeping both reminder email translations and existing recovery email translations