Merge pull request #1907 from TheBlueMatt/2022-12-abandon-crash-reset