Merge pull request #21145 from stangri/master-curl