Merge pull request #23571 from eileenmcnaughton/no_send