Merge "Fix the owner of RescuePartyTest" into main