Merge "Debug logging improvement." into jb-mr2-dev