Merge "Fixes not working TCPSelctServer"