Parent server

Open Pavel Smolyakov requested to merge parent-server into master