Merge branch 'jk/disable-pack-reuse-when-broken'