Merge branch 'branch-weiyu' into new_fuzzer