Merge pull request #18004 from stangri/master-curl