Follow-up to #16228: [Feature] TCA tree