Merge pull request #21101 from eileenmcnaughton/inv3