Merge branch 'kb/name-hash' into maint-1.8.1