Merge branch 'feature/rate-limiter' into 'develop'