Improve rate limit handling

Closes #3495813

Merge request reports

Loading