Merge "Improve logging"