Merge pull request #3208 from ludovic-henry/iolayer-remove-shared