Merge pull request #19745 from stangri/master-curl