Merge "Improve client logging"