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