[#6] Improved restartability and reliability during abrupt shutdown