Merge "Modify logging to debug this issue" into jb-dev