Merge "Revert "Logging to investigate a crash"" into jb-mr2-dev