Code

Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge