commit add time ticker
add timer modified
Merge remote-tracking branch 'origin/release' into zhangjc