Specify UTF-8 to avoid problems with overscore character.
Merge remote-tracking branch 'upstream/master'
Close the `avoid cmd` feature by default