Merge branch 'cpack-wix-sources' into release-3.11

Merge-request: !2116