Merge branch 'dp/maint-rebase-fix'