Add changes from master
Remove the reset subcommand, there's a core command that does this.