Merge branch 'db/make-with-curl'