Merge branch 'search_switch_user_dialog' into develop