Merge pull request #19460 from stangri/master-curl