Merge branch 'new_fuzzer' into branch-weiyu