Merge branch 'search' into arati