Merge pull request #18682 from eileenmcnaughton/add4