Merge "Improved rate limit log to mention IP"