Merge branch 'en/header-cleanup' into maint-2.43