Merge pull request #23686 from demeritcowboy/primary-ts