Optimize flaubert (#5651)

Commit

5 years ago

Optimize flaubert (#5651) * optimize flaubert * fix an issue and format * revert non-relevent change * review comments