Merge pull request #18739 from eileenmcnaughton/ef