TDQ-9774 Add related TableState for indicators