Merge branch 'jc/maint-name-hash-clear' into maint