Merge code into main

previously I mistook exec as fork, and was restoring the state of the
exec'ed process

The crash string is valid if it the string starts and contains "it's a
feature, not a bug!".