Again: This pull request is ready for merge and consistent with current code. Changing behaviour to unshare requires additional research and possibly test coverage. I am not going to do that as part of this pull request.