Merge pull request #6859 from illume/upstream-artifact-package-name-0030