Merge branch 'fix/1659-rate-limiter' into 'develop'