Merge branch 'np/maint-safer-pack' into maint