Merge pull request #20261 from eileenmcnaughton/tt2