Merge pull request #6996 from eileenmcnaughton/t