Merge branch 'develop' into search_switch_user_dialog