custom search feature updated
Merge branch 'release/7.x-0.34.1' into develop