Merge \\\"Reset debug message callback if exception is thrown\\\" into nyc-dev am...