merge master into incremental store branch

fixed search API bug