Infra 272 better rate limit handling

We discussed this, I couldnt find the blog post you mentioned.