Merge branch 'jk/subtree-install-fix' into maint