Merge thread pool branch back to master
This branch will collect the thread pool changes until we can fully switch, to prevent having a temporary slower master.
This branch will collect the thread pool changes until we can fully switch, to prevent having a temporary slower master.