Merge branch 'dm/unbash-subtree' into maint