Merge branch 'np/pack-safer'