Merge "Logging cleanup" into main