Fix PPD search (#10646)
Merge remote-tracking branch 'lhm/2.7-lhm' into 2.7-lhm