Merge pull request #19898 from eileenmcnaughton/teardown2