*8787* Adapt to tabbed workflow header