Merge remote-tracking branch 'lorenzo/pci/keystone' into next