Merge pull request #6911 from illume/upstream-package-verification-names-0045