PLF-4399: Merge unified search on master, change wrong version
PLF-4399: Merge unified search on master, change wrong version
Merge remote-tracking branch 'remotes/origin/master' into feature/activity-type