Merge pull request #19405 from eileenmcnaughton/inv