Merge "Disabling RescueParty flag resets" into main