Merge branch 'fix-rate-limit-test' into 'develop'