Merge "First implementation for Client and Server in same process. Additionally...