Making thread count configurable
Merge remote-tracking branch 'origin/dev/THREADHOTFIX' into release/2.6.3rc