US13377 #13420 Searching for activity type working
Merge remote-tracking branch 'origin/develop' into develop