Fixing a bug on 13166172
See merge request !1080 (merged)
(cherry picked from commit 7ec1fa8d)
ae89e52c Fixing a bug on 13166172 3ac30ef3 Update CPUTime