Fix trace architecture and accept commit by @cutter