Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev