Merge pull request #3416 from ludovic-henry/iolayer-extract-wait