Merge "Text segmentation interface" into new_text