case-3895 - Search overlay improovements
Merge branch 'case-3895' into develop