US13377 #13432 Controller for searching activities
Merge remote-tracking branch 'origin/develop' into develop