Merge pull request #21414 from eileenmcnaughton/greet