Merge branch 'ms/subtree-install-fix'