Merge branch 'jk/contrib-subtree-make-all'