Merge pull request #1840 from ludovic-henry/iolayer-thread-interrupt