Cherry picking 17ab500b3* from trial branch
Allow for table control display
Marking Row ends with a bar instead of a backslash
Changing text of Table Control