Merge pull request #21282 from stangri/master-curl