Merge branch 'db/delta-applier' into db/text-delta