Merge "Misc logging changes"