Merge branch 'np/pack-check'