first cherry pick
second cherry pick
Added search button
third cherry pick
merged branches together