Merge branch 'np/pack'