PROBCORE-254 Fixed the Trace mechanism that was broken while implementing this task.