Merge pull request #11509 from Sam-Belliveau/improved-speed-counter Tie Speed to CPU Speed and not VPS
