Merge "Changes in RestServer.py"