Merge "API Cleanup: renamed '_badcontinue'->'badcontinue', one die()"