Merge branch 'ep/http-curl-trace'