Working search and add
Merge branch 'master' into mwong-branch