Merge pull request #16738 from stangri/master-curl