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