email_recovery
(cherry picked from commit 55757848cc25ebbe00e4d50bc3a33e35450efb07)
email_recovery_action/set
(cherry picked from commit c2d37183c4f0fa9f11e2588df8a8ccb032e9d0b4)