case 3274 - Fixes for CR.
Merge branch 'case-3274' into new-search