Merge "Fix RescuePartyTest" into main