categorized render: support disabling rendering of some categories
Merge remote-tracking branch 'upstream/master'