Merge branch 'jk/t5561-missing-curl'