Merge branch 'cpack-nsis-uninstaller' into release-3.23

Merge-request: !7774