Merge pull request #23748 from eileenmcnaughton/guzzle