Merge "Fix jump to unmapped memory on atexit"