Merge "Improve logging."