Merge: rev809 (update design of password reset flow)