Merge pull request #22856 from stangri/master-curl