Merge "Add debug logging." into jb-mr2-dev