Merge "Merge "Fix RescuePartyTest" into main am: bf6d630ff4 am: 3d148eeead" into main