Port the #6884 fix to packaging
3 files changed