Merge branch 'revert-debian-libexec' into release-3.20

Merge-request: !6607