Merge "Add debug dump if about to segfault" into nyc-dev