Merge "Improve logging of credentials"