Bug fix for search issue.
Merge remote-tracking branch 'origin/master'