Correct alive timer
Merge
Merge recent changes