Merge "Include debugger connection status in error entry"