Merge pull request #23787 from stangri/master-curl