Merge "Fix a concurrency bug in the ranking reconsideration."