Merge "Handling removing <original-package> tag" into rvc-qpr-dev