Merge branch 'dp/maint-rebase-fix' into maint