Merge branch 'jk/make-fix-dependencies' into maint