Inherited TV value label fix
Inherited TV value label fix with RTE

Merge remote-tracking branch 'origin/pr/11681' into develop

* origin/pr/11681:
  Inherited TV value label fix