Merge "Improve debug output." into jb-mr1-dev