Merge branch 'kill_arch_fast_hash'