TimeService.getCurrentTime returns null
Merge branch 'topic-hotfix-1' into topic-time-v2