Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add search support - by o2ri
Bump the version for search support