new kb design
Merge remote-tracking branch 'upstream/master' into bug-929361