Merge "Correctly configure rate limiter"