Merge branch 'pci/header-cleanup-immutable'