Merge branch 'np/pack-default'