update custom search
update version
Merge branch 'release/7.x-0.40.5'