Merge "Migrate remaining parsePackage V1 to V2" into rvc-dev