Merge PR #2221 and PR #2249 to use accurate cpu count stt-wide

[wasertech]

Merged #2211 and #2249 to get a more accurate cpu count stt-wide.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 4 committers have signed the CLA.

✅ HarikalarKutusu
✅ NanoNabla
✅ wasertech
❌ Danny Waser

---

Danny Waser seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}