Merge branch 'chore/concurrent_limiter_update' into 'develop'