Merge "TextController - Update the text model." into devel/master