Port the fix for #13193 to packaging
2 files changed