47 Minutes Ago
merge from console_quickjoin_fix