Merge "Misc logging improvements"