Merge "Improve debug logging for bug reports"