Fixed timer handling
auto-merge staging into master