Merge branch 'feature-thread-limit' into develop