Add time to countdown timer
Merge branch 'release/1.5.1'