Fix ending block time
Merge branch 'dev'