Merge "Improving logging."