Updates #23330 include child categories by default (overrideable)