Fix timeline service.
Merge branch 'master' into distributed_services