Merge search into master

Please merge search into the master branch.