Merge "Updating RescueParty owners"