21 Days Ago
merge from authorize_friend_lag_fix