Code

Merge branch 'db/delta-applier' into svn-fe