Merge branch 'master' into Updates
update custom search module
Merge branch 'Updates'