Merge branch 'wix-cmake-downgrade-fix' into release-3.14

Merge-request: !3087