Update TBB C&C's with Sheng's (shengfuintel) latest code

Git cherry-picking of the original pull request missed a few changes to these files.

Thanks again to Sheng for this most excellent contribution !