KRACOEUS-8535: speeding up PD search in order to address hierarchy issues.
Merge pull request #1304 from leoherbie/KRACOEUS-8535_3

KRACOEUS-8535: speeding up PD search in order to address hierarchy issue...