Merge pull request #3509 from ludovic-henry/iolayer-extract-threading