Merge branch 'dt/name-hash-dir-entry-fix'