Merge branch 'cpack-deb-mr-1296-fix' into release-3.10

Merge-request: !1375