Today
Merge from teamui_switch_server_fix