Merge changes from topic "original-package-fix-rvc-qpr-dev" into rvc-qpr-dev

* changes:
  Handling removing <original-package> tag
  Revert "Handling removing <original-package> tag"