issue #20630: Add tabs to S/O