Merge pull request #21687 from stangri/master-curl