Timeout handler
Revert "Timeout handler"

This reverts commit 27c55157c6595fb754a4177b06a88f05b3528d37.
Revert "Revert "Timeout handler""

This reverts commit bf2bb251178390ac4cbdfdb0517223da2c66d8eb.
Alert on first entry