Merge "Disabling RescueParty flag resets on master branch."