Merge branch 'db/length-as-hash' (early part) into db/svn-fe-code-purge