Time fix
Merge branch 'time-fix' into develop