Merge branch 'mh/remove-subtree-long-pathname-fix' into maint