3 Months Ago
merge from xorswitch_restart_fix