46 Minutes Ago
merge from fix_extra_autoswitching_log