Merge branch 'heads/bugfix-rate-limiting' into develop

4 jobs for develop in 18 minutes and 25 seconds