Merge "Logging improvements for C++ / Java structure issues"