Merge "Attempt to automatically restore after crash"