Merge branch 'jk/delta-chain-limit' into maint