merge from master

4 jobs for index_games2 in 6 minutes and 6 seconds (queued for 1 second)