Merge branch 'new_fuzzer' into tmp