Merge branch 'np/maint-limit-delta-cache' into maint