Fixed benchmark failures in TM
This MR Fixes #3106 (closed), and Fixes #3108 (closed) as well.
-
Feature description was added to the changelog -
Tests covering your feature were added? -
Any new feature or behavior change was documented?
This MR Fixes #3106 (closed), and Fixes #3108 (closed) as well.