Merge "Bug 5938 - Improve the logging."