Merge "Refactor PackageParser (2/n)" into sc-dev