Merge "Fix rate limit API review comments"