re #8924 Addded rate limit handling