Merge branch 'tc/curl-with-backports'