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