Merge pull request #23969 from dibdot/curl