Merge "TET cases for Text." into devel/master