Merge "TextModel interface" into new_text