Re-synching to previous commits to get search for device working right again.
Final re-synch commit