Merge "Switch to socket communication with uncrypt." into nyc-dev