some rework on TimeOnlyService
Merge master in
merge