Merge branch 'jk/delta-chain-limit'