Merge branch 'np/verify-pack' into maint