Merge branch 'cpack-default-package-version-zero' into release-3.12

Merge-request: !2239