new draft
type -> kind
Merge remote-tracking branch 'github/master'