Merge pull request #1916 from ludovic-henry/iolayer-remove-sharedhandle