Tab highlights fixes.

Closes #3399956

Merge request reports

Loading