US13377 #13420 Search service working for all three fields
Merge remote-tracking branch 'origin/develop' into develop