Merge branch 'jh/memihash-opt' into maint