Merge branch 'backport-3.18-ci-wix-download' into release-3.18

Merge-request: !5725