Merge "Fix debug log." into jb-mr1-dev