Merge branch 'jc/pack-peeled'