Merge pull request #4962 from lambdageek/dev-handles-sockets