Merge commit 'jtellier/confirm-lose-accounts-settings'