Merge "Add ResetPasswordWithToken migration code." into main