case 2318 - Search routine required keys.
Merge branch 'case-2318' into develop