Merge branch 'da/subtree-date-confusion' into maint