Merge branch 'jc/pack'