Merge branch 'bp/name-hash-dirname-fix'