Fix update_all_user_ratings
Merge remote-tracking branch 'upstream/r4' into r4