Merge "Improve HTTP logging"