Merge "TF-TF: Fix bug in calculation of number of CPUs"