Merge branch 'db/svn-fe-code-purge' into svn-fe