Merge "Fix broken trace collection"