Fix labels / tvs in custom FC tabs
Fix labels / TVs in custom FC tabs

Addresses #11758

Merge remote-tracking branch 'origin/pr/11761'

* origin/pr/11761:
  Fix labels / tvs in custom FC tabs