Merge "Fix original-package support" into rvc-dev