Merge "Logging improvements to improve efficiency - specifically in critical path...