Merge "Add package information to RescueParty uiderrors" into sc-dev