[#6] Improved restartability of the batch application