Correct alive timer
Merge