Merging production branch, with rate limiting and stuff