Merge branch 'np/maint-safer-pack'