Merge "Allow for wait in _restore_password"