Merge branch 'dp/remove-duplicated-header-inclusion' into maint