#443 tabs - GHI part

Merge request on the GHI part alone to avoid too many conflicts.