Merge "Fix rate limit handling and logging"