Fix double macro expansion in trace.

Edwin Carlinetrequested to merge
development/fix-trace-stack into dev

Merge request reports