Merge "Refactoring RescueParty for CrashRecovery" into main