5 Commits (resolve_recovery_strategy)