Hotfix - removed hardcoded timestamp from time cursor
Merge branch 'master' into feature/modulemanager