Merge branch 'np/pack-broken-boundary' into maint