Merge branch 'master', remote branch 'origin'
Modified next_thread_to_run