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