Merge "Improve RestClient rate limiting"