Merge pull request #21149 from stangri/master-curl