Search field delegate
Merges with origin/master