Merge branch 'nd/preallocate-hash' into next