Merge branch 'fp/make-j'