Merge branch 'np/pack' into next