Merge branch 'np/maint-huge-delta-generation'