Revert "Revert "Shutdown Timer""

This reverts commit 4634897b077d1a666904eb91603d7981ae68a5ba.