Merge pull request #19232 from eileenmcnaughton/friend