case 4248 - Use correct search method.
Merge branch 'case-4248' into develop