Merge branch '2843_search_hotkey_conflict' into 4.8.1-stable