Merge branch 'bjorn-pci-root-v4-2.6.35' into release