TEST: PCI-4155 Forward port changes from intgdc