Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'