US13377 #13420 First steps of service search. Database type change
US13377 #13420 First steps of service search.
Merge remote-tracking branch 'origin/develop' into develop
Merge solve