Merge branch 'nd/pack-deltify-regression-fix'