Merge "Handling removing <original-package> tag"