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