[rhel7-branch] TUI category backports (#1128616)