Merge pull request #2343 from ludovic-henry/threads-cleanup