Rin
41 Minutes Ago
merge from quick_join_not_updating_fix