hotfix: bug in block 284193
get rid of 'time_left' functions
Merge branch 'develop'