Merge pull request #4015 from xmcclure/new-threads-collect-fix