Merge pull request #18139 from grokability/#18082-add-company-to-seat…

Merge pull request #18139 from grokability/#18082-add-company-to-seat… #2537