Merge "Fix up discrepancies between v1 and v2 package parsing" into rvc-dev