Manually merged with the fakemaster(remote service). Context Collector
is disabled. Scheduler has cleaned from several TODOs and bugs.