Fixed benchmark failures in TM

This MR Fixes #3106 (closed), and Fixes #3108 (closed) as well.

  1. Feature description was added to the changelog
  2. Tests covering your feature were added?
  3. Any new feature or behavior change was documented?

Merge request reports

Loading