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