PLF-4399: Merge unified search on master, change wrong version