Merge branch 'jc/pack-reuse'