rel #17990 : CompositeBuilder optimization, do not try to link orphan categories in loop but try it once after all categories were added