Merge branch 'jk/build-with-right-curl'