Fixes search result ambiguity issue
Merge branch 'devsetup' into gh-pages