Merge pull request #16227 from demeritcowboy/more-t