Merge pull request #19066 from colemanw/tabCleanup