Merge pull request #2733 from elfiesmelfie/feat_pcie_aer