Merge branch 'backport-3.22-ci-package-uploads' into release-3.22

Merge-request: !7142