Merge branch 'dg/subtree-rebase-test' into maint